X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_audio.h;h=0c9a666691e64f62f4926041d41f4fc0679e33cf;hb=3a55f20f6b627db61294523f7bf34344514e7166;hp=e375a5bf087159f74bd0a4dabdc0b5275a965326;hpb=d7980e9e89e1e75ea457ff995fb199586260049c;p=fishladder.git

diff --git a/vg/vg_audio.h b/vg/vg_audio.h
index e375a5b..0c9a666 100644
--- a/vg/vg_audio.h
+++ b/vg/vg_audio.h
@@ -28,6 +28,8 @@ struct sfx_system
 	// Source buffer start
 	float *source, *replacement;
 	
+	u32 clip_start, clip_end, buffer_length;
+	
 	// Modifiers
 	sfx_vol_control *vol_src;
 	float	vol;
@@ -639,6 +641,11 @@ static void sfx_set_playrnd( sfx_set *source, sfx_system *sys, int min_id, int m
 		sys->end 	= source->segments[ pick*2 + 1 ];
 		sys->ch 		= source->ch;
 		
+		// Diagnostics
+		sys->clip_start = sys->cur;
+		sys->clip_end = sys->end;
+		sys->buffer_length = source->segments[ (source->numsegments-1)*2 + 1 ];
+		
 		sfx_save( sys );
 	}
 }
@@ -647,13 +654,21 @@ static void sfx_system_fadeout( sfx_system *sys, u32 length_samples )
 {
 	if( sfx_begin_edit( sys ) )
 	{
-		sys->fadeout_current = length_samples;
-		sys->fadeout = length_samples;
+		if( sys->end )
+		{
+			sys->fadeout_current = length_samples;
+			sys->fadeout = length_samples;
+			
+			if( sys->thread_clone )
+				sys->cur = sys->thread_clone->cur;
 		
-		if( sys->thread_clone )
-			sys->cur = sys->thread_clone->cur;
-	
-		sfx_save( sys );
+			sfx_save( sys );
+		}
+		else
+		{
+			// Sound was not initialized
+			MUTEX_UNLOCK( sfx_mux_t01 );
+		}
 	}
 }