s_xmp_startPattern - makes the tracker song play a different pattern (for use with sub-songs)

Author: leilei-

code/client/snd_codec_xmp.c

@@ -43,7 +43,10 @@ void sound_deinit(void);
 
 
 
-
+static float fadey;
+extern cvar_t *s_xmp_startPattern;
+static int startpat;
+static int gopat;
 extern	int	samplingrate;		// from snd_dma
 
 void S_XMP_StartSong ( void )
@@ -58,6 +61,29 @@ void S_XMP_EndSong ( void )
 
 
 
+}
+
+
+// TODO: A callback to set this appropriately from game context (monster sight, level triggers)
+void S_XMP_CheckForFade ( void )
+{
+	gopat = s_xmp_startPattern->integer;
+
+	if ((gopat != startpat))
+	{
+		fadey -= 0.025f;
+	//	Com_Printf("AHHHFADING TO PATTERN %i!!! %f\n", startpat, fadey);
+		xmp_set_player(xmpsong, XMP_PLAYER_VOLUME, (fadey * 128));
+	}
+
+	if ((startpat != gopat) && (fadey < 0.01))
+	{
+		startpat = gopat;
+		xmp_set_position(xmpsong, startpat);
+		xmp_set_player(xmpsong, XMP_PLAYER_VOLUME, 128);
+		fadey = 1;
+	}
+
 }
 
 int	aintistreaming = 0;
@@ -79,7 +105,7 @@ S_XMP_CodecOpenStream
 =================
 */
 
-// FIXME: there's a memory leak here if you start the same song many many many many times.
+// FIXME: there's a memory leak here if you start the same song many many many many times?
 snd_stream_t *S_XMP_CodecOpenStream(const char *filename)
 {
 	// First let's close whatever song we had....
@@ -130,7 +156,14 @@ snd_stream_t *S_XMP_CodecOpenStream(const char *filename)
 		FS_FCloseFile(file);		// unfortunately these do not help with the leak
 
 		if (itsloaded == 0)
-			itsloaded = xmp_start_player(xmpsong, xmpspeed, 0);	// TODO: do sample rate of the mixer.
+		{
+			itsloaded = xmp_start_player(xmpsong, xmpspeed, 0);	
+			startpat=s_xmp_startPattern->integer;
+			gopat = startpat;
+			fadey = 1.0;
+			xmp_set_player(xmpsong, XMP_PLAYER_VOLUME, 128);
+			xmp_set_position(xmpsong, startpat);
+		}
 
 		if (itsloaded == 0) {
 			//	Com_Printf("XMP loaded our buffer of the file %s which is %i long \n", filename, thelength);
@@ -197,6 +230,8 @@ int S_XMP_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer)
 		return 0;
 	}
 
+	S_XMP_CheckForFade();
+
 	return bytes;
 }
 

code/client/snd_local.h

@@ -241,6 +241,8 @@ extern short *sfxScratchBuffer;
 extern sfx_t *sfxScratchPointer;
 extern int	   sfxScratchIndex;
 
+extern cvar_t *s_xmp_startPattern;
+
 qboolean S_Base_Init( soundInterface_t *si );
 
 // OpenAL stuff

code/client/snd_main.c

@@ -35,6 +35,7 @@ cvar_t *s_muteWhenMinimized;
 cvar_t *s_muteWhenUnfocused;
 
 cvar_t *s_interrupts;
+cvar_t *s_xmp_startPattern;
 
 static soundInterface_t si;
 
@@ -490,7 +491,7 @@ void S_Init( void )
 	s_interrupts = Cvar_Get( "s_interrupts", "0", CVAR_ARCHIVE ); // leilei - pre-1.25 sound behavior
 	s_muteWhenMinimized = Cvar_Get( "s_muteWhenMinimized", "0", CVAR_ARCHIVE );
 	s_muteWhenUnfocused = Cvar_Get( "s_muteWhenUnfocused", "0", CVAR_ARCHIVE );
-
+	s_xmp_startPattern = Cvar_Get( "s_xmp_startPattern", "0", CVAR_CHEAT ); // leilei - starting pattern for song
 	cv = Cvar_Get( "s_initsound", "1", 0 );
 	if( !cv->integer ) {
 		Com_Printf( "Sound disabled.\n" );