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

[Torbj?rn Andersson]

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

Modified Files:
	d_sound.cpp 
Log Message:
Since soundHandleMusic[] is now an array of sound handles instead of
channel indexes, we should use stopHandle() instead of stop() to kill the
music channel.

Am I the only one who finds the distinction between channel indexes and
sound handles confusing at times? :-)


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- d_sound.cpp	1 Sep 2003 13:43:21 -0000	1.26
+++ d_sound.cpp	2 Sep 2003 12:55:20 -0000	1.27
@@ -1205,7 +1205,7 @@
 }
 
 void Sword2Sound::StartMusicFadeDown(int i) {
-	g_engine->_mixer->stop(soundHandleMusic[i]);
+	g_engine->_mixer->stopHandle(soundHandleMusic[i]);
 	musFading[i] = -16;
 	musStreaming[i] = 0;
 	fpMus.close();
@@ -1231,7 +1231,7 @@
 			primaryStream = 1;
 
 		musFading[primaryStream] = 0;
-		g_engine->_mixer->stop(soundHandleMusic[primaryStream]);
+		g_engine->_mixer->stopHandle(soundHandleMusic[primaryStream]);
 		musStreaming[primaryStream] = 0;
 	}
 
@@ -1798,7 +1798,7 @@
 			if (musFading[i]) {
 				if (musFading[i] < 0) {
 					if (++musFading[i] == 0) {
-						g_engine->_mixer->stop(soundHandleMusic[i]);
+						g_engine->_mixer->stopHandle(soundHandleMusic[i]);
 						musStreaming[i] = 0;
 						musLooping[i] = 0;
 					} else {
@@ -1916,7 +1916,7 @@
 
 					// End of the music so we need to start fading and start the music again
 					if (fade) {
-						g_engine->_mixer->stop(soundHandleMusic[i]);
+						g_engine->_mixer->stopHandle(soundHandleMusic[i]);
 						musFading[i] = -16;		// Fade the old music
 
 						// Close the music cluster if it's open