[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.30,1.31

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv18792/driver

Modified Files:
	d_sound.cpp 
Log Message:
Unless I'm gravely mistaken, StreamCompMusic() should always create a new
stream, in which case the warning about the sound handle being 0 is bogus.


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- d_sound.cpp	2 Sep 2003 15:55:55 -0000	1.30
+++ d_sound.cpp	2 Sep 2003 16:20:10 -0000	1.31
@@ -1352,20 +1352,14 @@
 	int8 pan;
 
 	if (v0 > v1) {
-			volume = musicVolTable[v0];
-			pan = (musicVolTable[v1 * 16 / v0] / 2) - 127;
-//		IDirectSoundBuffer_SetVolume(lpDsbMus[primaryStream], musicVolTable[v0]);
-//		IDirectSoundBuffer_SetPan(lpDsbMus[primaryStream], musicVolTable[v1*16/v0]);
+		volume = musicVolTable[v0];
+		pan = (musicVolTable[v1 * 16 / v0] / 2) - 127;
 	} else if (v1 > v0) {
-			volume = musicVolTable[v1];
-			pan = (musicVolTable[v0 * 16 / v1] / 2) + 127;
-//		IDirectSoundBuffer_SetVolume(lpDsbMus[primaryStream], musicVolTable[v1]);
-//		IDirectSoundBuffer_SetPan(lpDsbMus[primaryStream], -musicVolTable[v0*16/v1]);
+		volume = musicVolTable[v1];
+		pan = (musicVolTable[v0 * 16 / v1] / 2) + 127;
 	} else {
-			volume = musicVolTable[v1];
-			pan = 0;
-//		IDirectSoundBuffer_SetVolume(lpDsbMus[primaryStream], musicVolTable[v1]);
-//		IDirectSoundBuffer_SetPan(lpDsbMus[primaryStream], 0);
+		volume = musicVolTable[v1];
+		pan = 0;
 	}
 
 	// FIXME: Until the mixer supports LE samples natively, we need to
@@ -1374,14 +1368,10 @@
 		data16[i] = TO_BE_16(data16[i]);
 	}
 
-	if (soundHandleMusic[primaryStream] == 0) {
-		warning("play music newStream(): this shouldn't happen");
-//		assert(!soundHandleMusic[primaryStream]);
-		g_engine->_mixer->newStream(&soundHandleMusic[primaryStream], data16, bufferSizeMusic, 22050,
-					SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE, 100000, volume, 0);
-	} else {
-		g_engine->_mixer->appendStream(soundHandleMusic[primaryStream], data16, bufferSizeMusic);
-	}
+	g_engine->_mixer->newStream(&soundHandleMusic[primaryStream], data16,
+		bufferSizeMusic, 22050,
+		SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE,
+		100000, volume, pan);
 
 	// Recorder some last variables
 	musStreaming[primaryStream] = 1;