[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.56,1.57 d_sound.cpp,1.144,1.145

Max Horn fingolfin at users.sourceforge.net
Wed Mar 9 10:13:11 CET 2005


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27444/sword2/driver

Modified Files:
	animation.cpp d_sound.cpp 
Log Message:
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- animation.cpp	6 Mar 2005 14:12:40 -0000	1.56
+++ animation.cpp	9 Mar 2005 18:12:53 -0000	1.57
@@ -182,7 +182,7 @@
 
 		leadIn += sizeof(StandardHeader);
 
-		_vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicAudioDataType);
+		_vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
 	}
 
 	byte *leadOut = NULL;
@@ -301,7 +301,7 @@
 		frameCounter++;
 
 		if (frameCounter == leadOutFrame && leadOut)
-			_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicAudioDataType);
+			_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
 
 		OSystem::Event event;
 		while (_sys->pollEvent(event)) {
@@ -516,7 +516,7 @@
 	// subtitles.
 
 	if (!skipCutscene && leadOut)
-		_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicAudioDataType);
+		_vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType);
 
 	_vm->_screen->setPalette(0, 256, oldPal, RDPAL_INSTANT);
 }

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- d_sound.cpp	27 Feb 2005 16:11:18 -0000	1.144
+++ d_sound.cpp	9 Mar 2005 18:12:54 -0000	1.145
@@ -771,7 +771,7 @@
 		p = -p;
 
 	// Start the speech playing
-	_vm->_mixer->playInputStream(SoundMixer::kSpeechAudioDataType, &_soundHandleSpeech, input, -1, volume, p);
+	_vm->_mixer->playInputStream(SoundMixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p);
 	return RD_OK;
 }
 





More information about the Scummvm-git-logs mailing list