[Scummvm-cvs-logs] CVS: scummvm/sky sound.cpp,1.35,1.36 intro.cpp,1.36,1.37

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv14321/sky

Modified Files:
	sound.cpp intro.cpp 
Log Message:
moved the sound ID param in playRaw before volume/pan

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- sound.cpp	2 Sep 2003 07:49:40 -0000	1.35
+++ sound.cpp	5 Sep 2003 22:09:56 -0000	1.36
@@ -1054,7 +1054,7 @@
 	memcpy(buffer, sound+sizeof(struct dataFileHeader), size);	
 	
 	_mixer->stopID(id);
-	return _mixer->playRaw(handle, buffer, size, 11025, flags, 255, 0, id);
+	return _mixer->playRaw(handle, buffer, size, 11025, flags, id);
 }
 
 void SkySound::loadSection(uint8 pSection) {
@@ -1130,9 +1130,9 @@
 	
 	_mixer->setVolume(volume);
 	if (channel == 0)
-		_mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, 255, 0, SOUND_CH0, loopSta, loopEnd);
+		_mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH0, loopSta, loopEnd);
 	else
-		_mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, 255, 0, SOUND_CH1, loopSta, loopEnd);
+		_mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH1, loopSta, loopEnd);
 }
 
 void SkySound::fnStartFx(uint32 sound, uint8 channel) {
@@ -1251,6 +1251,6 @@
 	free(speechData);
 
 	_mixer->stopID(SOUND_SPEECH);
-	_mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 255, 0, SOUND_SPEECH);
+	_mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, SOUND_SPEECH);
 	return true;
 }

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- intro.cpp	2 Sep 2003 07:49:40 -0000	1.36
+++ intro.cpp	5 Sep 2003 22:09:56 -0000	1.37
@@ -718,7 +718,7 @@
 			// directly, but this will have to do for now.
 			memset(vData, 127, sizeof(struct dataFileHeader));
 			_mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025,
-								SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, 255, 0, SOUND_VOICE);
+								SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE);
 			return true;
 		case WAITVOICE:
 			while (_voice)
@@ -735,12 +735,12 @@
 		case LOOPBG:
 			_mixer->stopID(SOUND_BG);
 			_mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
-							SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, 255, 0, SOUND_BG);
+							SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, SOUND_BG);
 			return true;
 		case PLAYBG:
 			_mixer->stopID(SOUND_BG);
 			_mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
-							SoundMixer::FLAG_UNSIGNED, 255, 0, SOUND_BG);
+							SoundMixer::FLAG_UNSIGNED, SOUND_BG);
 			return true;
 		case STOPBG:
 			_mixer->stopID(SOUND_BG);