From 67b311713d8f4cfcd460a9649e0075f24278a048 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 27 Dec 2004 00:27:00 +0000 Subject: 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 svn-id: r16330 --- kyra/kyra.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kyra') diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index 3ed497581d..b81bafb289 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -105,8 +105,8 @@ KyraEngine::KyraEngine(GameDetector *detector, OSystem *syst) 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) { -- cgit v1.2.3