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

[Pawel Kolodziejski]

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

Modified Files:
	d_sound.cpp 
Log Message:
fixed not cleared sound handle for music

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- d_sound.cpp	30 Aug 2003 20:27:48 -0000	1.16
+++ d_sound.cpp	30 Aug 2003 21:09:13 -0000	1.17
@@ -1169,6 +1169,7 @@
 	musFading[i] = -16;
 	musStreaming[i] = 0;
 	fpMus.close();
+	soundHandleMusic[i] = 0;
 }
 
 int32 Sword2Sound::StreamCompMusic(const char *filename, uint32 musicId, int32 looping) {
@@ -1279,7 +1280,7 @@
 		}
 
 		if (soundHandleMusic[i] == 0) {
-				soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050, SoundMixer::FLAG_16BITS, 100000);
+			soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050, SoundMixer::FLAG_16BITS, 100000);
 		} else {
 			g_engine->_mixer->appendStream(soundHandleMusic[i], data16, bufferSizeMusic);
 		}
@@ -1298,6 +1299,7 @@
 		musFading[i] = 0;
 		g_engine->_mixer->endStream(soundHandleMusic[i]);
 		musStreaming[i] = 0;
+		soundHandleMusic[i] = 0;
 	} else if (musStreaming[0] + musStreaming[1] == 1)	{
 		i = musStreaming[0];			// Set i to the free channel
 
@@ -1837,6 +1839,7 @@
 						g_engine->_mixer->endStream(soundHandleMusic[i]);
 						musStreaming[i] = 0;
 						musLooping[i] = 0;
+						soundHandleMusic[i] = 0;
 					} else {
 	    			//  Modify the volume according to the master volume and music mute state
 						if (musicMuted)
@@ -1932,6 +1935,7 @@
 
 					// End of the music so we need to start fading and start the music again
 					if (fade) {
+						soundHandleMusic[i] = 0;
 						musFading[i] = -16;		// Fade the old music
 
 						// Close the music cluster if it's open
@@ -1944,6 +1948,8 @@
 							StreamCompMusic(musFilename[i], musId[i], musLooping[i]);
 						}
 					}
+				} else {
+						soundHandleMusic[i] = 0;
 				}
 			}
 		}