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

[Pawel Kolodziejski]

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

Modified Files:
	d_sound.cpp 
Log Message:
revert id handle stuff

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- d_sound.cpp	30 Aug 2003 18:06:08 -0000	1.14
+++ d_sound.cpp	30 Aug 2003 20:25:07 -0000	1.15
@@ -339,9 +339,9 @@
 	memset(musEnd,		0, sizeof(musEnd));
 	memset(musLastSample,	0, sizeof(musLastSample));
 	memset(musId,		0, sizeof(musId));
-	memset(soundHandleMusic, -1, sizeof(soundHandleMusic));
-	memset(soundHandleFx, -1, sizeof(soundHandleFx));
-	soundHandleSpeech = -1;
+	memset(soundHandleMusic, 0, sizeof(soundHandleMusic));
+	memset(soundHandleFx, 0, sizeof(soundHandleFx));
+	soundHandleSpeech = 0;
 	memset(bufferFx, 0, sizeof(bufferFx));
 	memset(flagsFx, 0, sizeof(flagsFx));
 	memset(bufferSizeFx, 0, sizeof(bufferSizeFx));
@@ -350,7 +350,7 @@
 }
 
 int32 Sword2Sound::AmISpeaking() {
-	if ((!speechMuted) && (!speechPaused) && (soundHandleSpeech != -1)) {
+	if ((!speechMuted) && (!speechPaused) && (soundHandleSpeech != 0)) {
 		if (g_engine->_mixer->isChannelActive(soundHandleSpeech))
 			return (RDSE_SPEAKING);
 	}
@@ -549,7 +549,7 @@
 		for (uint j = 0; j < (bufferSize / 2); j++)
 			data16[j] = TO_BE_16(data16[j]);
 
-		soundHandleSpeech = -1;
+		soundHandleSpeech = 0;
 		_mixer->playRaw(&soundHandleSpeech, data16, bufferSize, 22050, flags);
 			
 		speechStatus = 1;
@@ -566,7 +566,7 @@
   
 	if (speechStatus) {
 		g_engine->_mixer->stopHandle(soundHandleSpeech);
-		soundHandleSpeech = -1;
+		soundHandleSpeech = 0;
 		speechStatus = 0;
 		return(RD_OK);
 	}
@@ -582,7 +582,7 @@
 
 	if (g_engine->_mixer->isChannelActive(soundHandleSpeech) == false) {
 		speechStatus = 0;
-		soundHandleSpeech = -1;
+		soundHandleSpeech = 0;
 		return(RDSE_SAMPLEFINISHED);
 	}
 	return(RDSE_SAMPLEPLAYING);
@@ -590,7 +590,7 @@
 
 void Sword2Sound::SetSpeechVolume(uint8 volume) {
 	speechVol = volume;
-	if ((soundHandleSpeech != -1) && !speechMuted && GetSpeechStatus() == RDSE_SAMPLEPLAYING) {
+	if ((soundHandleSpeech != 0) && !speechMuted && GetSpeechStatus() == RDSE_SAMPLEPLAYING) {
 //		IDirectSoundBuffer_SetVolume(dsbSpeech, volTable[16*speechVol]);
 	}
 }
@@ -1278,7 +1278,7 @@
 			data16[j] = TO_BE_16(data16[j]);
 		}
 
-		if (soundHandleMusic[i] == -1) {
+		if (soundHandleMusic[i] == 0) {
 				soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050, SoundMixer::FLAG_16BITS, 100000);
 		} else {
 			g_engine->_mixer->appendStream(soundHandleMusic[i], data16, bufferSizeMusic);
@@ -1400,7 +1400,7 @@
 		for (int32 j = 0; j < (bufferSizeMusic / 2); j++)
 			data16[j] = TO_BE_16(data16[j]);
 
-		if (soundHandleMusic[i] == -1) {
+		if (soundHandleMusic[i] == 0) {
 				soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050, SoundMixer::FLAG_16BITS, 100000);
 		} else {
 			g_engine->_mixer->appendStream(soundHandleMusic[i], data16, bufferSizeMusic);
@@ -1919,7 +1919,7 @@
 						data16[j] = TO_BE_16(data16[j]);
 					}
 
-					if (soundHandleMusic[i] == -1) {
+					if (soundHandleMusic[i] == 0) {
 						soundHandleMusic[i] = g_engine->_mixer->newStream(data16, bufferSizeMusic, 22050, SoundMixer::FLAG_16BITS, 100000);
 					} else {
 						g_engine->_mixer->appendStream(soundHandleMusic[i], data16, len);