[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.122,1.123 sound.cpp,1.50,1.51

Max Horn fingolfin at users.sourceforge.net
Wed Mar 9 10:14:22 CET 2005


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

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

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- queen.cpp	6 Mar 2005 22:35:12 -0000	1.122
+++ queen.cpp	9 Mar 2005 18:12:39 -0000	1.123
@@ -405,9 +405,9 @@
 
 	if (!_mixer->isReady())
 		warning("Sound initialisation failed");
-	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	// Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages
-	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume);
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, SoundMixer::kMaxMixerVolume);
 
 	int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
 	MidiDriver *driver = MidiDriver::createMidi(midiDriver);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- sound.cpp	1 Jan 2005 16:09:09 -0000	1.50
+++ sound.cpp	9 Mar 2005 18:12:40 -0000	1.51
@@ -201,7 +201,7 @@
 void MP3Sound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	File *f = _vm->resource()->giveCompressedSound(name, &size);
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size));
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size));
 }
 #endif
 
@@ -209,7 +209,7 @@
 void OGGSound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	File *f = _vm->resource()->giveCompressedSound(name, &size);		
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size));
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size));
 }
 #endif
 
@@ -217,7 +217,7 @@
 void FLACSound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	File *f = _vm->resource()->giveCompressedSound(name, &size);		
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size));
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size));
 }
 #endif
 





More information about the Scummvm-git-logs mailing list