[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.484,1.485 sound.cpp,1.74,1.75

[Max Horn]

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

Modified Files:
	simon.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: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -d -r1.484 -r1.485
--- simon.cpp	22 Jan 2005 02:01:22 -0000	1.484
+++ simon.cpp	9 Mar 2005 18:12:45 -0000	1.485
@@ -666,7 +666,7 @@
 		warning("Sound initialization failed. "
 						"Features of the game that depend on sound synchronization will most likely break");
 	set_volume(ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 
 	_system->beginGFXTransaction();
 		initCommonGFX(detector);
@@ -4226,7 +4226,7 @@
 }
 
 void SimonEngine::set_volume(int volume) {
-	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, volume);
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, volume);
 }
 
 byte SimonEngine::getByte() {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- sound.cpp	14 Jan 2005 00:38:54 -0000	1.74
+++ sound.cpp	9 Mar 2005 18:12:47 -0000	1.75
@@ -129,7 +129,7 @@
 		error("playWav(%d): can't read WAVE header", sound);
 	}
 
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, stream);
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, stream);
 }
 
 void VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -177,7 +177,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeMP3Stream(_file, size));
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, makeMP3Stream(_file, size));
 }
 #endif
 
@@ -201,7 +201,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeVorbisStream(_file, size));
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, makeVorbisStream(_file, size));
 }
 #endif
 
@@ -225,7 +225,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeFlacStream(_file, size));
+	_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, makeFlacStream(_file, size));
 }
 #endif