[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.21,1.22

[Max Horn]

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

Modified Files:
	kyra.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: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kyra.cpp	9 Dec 2004 15:06:43 -0000	1.21
+++ kyra.cpp	27 Dec 2004 00:26:55 -0000	1.22
@@ -105,8 +105,8 @@
 		warning("Sound initialization failed.");
 	}
 
-	_mixer->setVolume(ConfMan.getInt("sfx_volume"));
-	_mixer->setMusicVolume(ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
 
 	// gets the game
 	if (detector->_game.features & GF_KYRA1) {