[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.479,1.480 sound.cpp,1.70,1.71

Max Horn fingolfin at users.sourceforge.net
Sun Dec 26 16:29:02 CET 2004


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

Modified Files:
	simon.cpp sound.cpp 
Log Message:
Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -d -r1.479 -r1.480
--- simon.cpp	25 Dec 2004 19:04:18 -0000	1.479
+++ simon.cpp	27 Dec 2004 00:26:58 -0000	1.480
@@ -665,7 +665,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->setMusicVolume(ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
 
 	_system->beginGFXTransaction();
 		initCommonGFX(detector);
@@ -4225,7 +4225,7 @@
 }
 
 void SimonEngine::set_volume(byte volume) {
-	_mixer->setVolume(volume);
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, volume);
 }
 
 byte SimonEngine::getByte() {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- sound.cpp	11 Dec 2004 23:34:34 -0000	1.70
+++ sound.cpp	27 Dec 2004 00:26:58 -0000	1.71
@@ -219,7 +219,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playInputStream(handle, makeMP3Stream(_file, size), false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeMP3Stream(_file, size));
 }
 #endif
 
@@ -243,7 +243,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playInputStream(handle, makeVorbisStream(_file, size), false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeVorbisStream(_file, size));
 }
 #endif
 
@@ -267,7 +267,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playInputStream(handle, makeFlacStream(_file, size), false);
+	_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeFlacStream(_file, size));
 }
 #endif
 





More information about the Scummvm-git-logs mailing list