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

[Pawel Kolodziejski]

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

Modified Files:
	d_sound.cpp 
Log Message:
possibly fixes for not exist id stream channel

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- d_sound.cpp	1 Sep 2003 06:13:47 -0000	1.24
+++ d_sound.cpp	1 Sep 2003 06:23:04 -0000	1.25
@@ -1209,7 +1209,7 @@
 }
 
 void Sword2Sound::StartMusicFadeDown(int i) {
-	g_engine->_mixer->endStream(soundHandleMusic[i]);
+	g_engine->_mixer->stop(soundHandleMusic[i]);
 	musFading[i] = -16;
 	musStreaming[i] = 0;
 	fpMus.close();
@@ -1903,9 +1903,10 @@
 					
 					if (soundHandleMusic[i] == 0) {
 						warning("play music appendStream(): this shouldn't happen");
-						int volume = musicVolTable[volMusic[i]];
-						soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050,
-										SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE, 100000, volume, 0);
+						assert(soundHandleMusic[i]);
+//						int volume = musicVolTable[volMusic[i]];
+//						soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050,
+//										SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE, 100000, volume, 0);
 					} else {
 						g_engine->_mixer->appendStream(soundHandleMusic[i], data16, len);
 					}
@@ -1917,6 +1918,7 @@
 
 					// End of the music so we need to start fading and start the music again
 					if (fade) {
+						g_engine->_mixer->stop(soundHandleMusic[i]);
 						soundHandleMusic[i] = 0;
 						musFading[i] = -16;		// Fade the old music
 
@@ -1930,8 +1932,6 @@
 							StreamCompMusic(musFilename[i], musId[i], musLooping[i]);
 						}
 					}
-				} else {
-						soundHandleMusic[i] = 0;
 				}
 			}
 		}