diff options
author | Jordi Vilalta Prat | 2010-09-08 09:37:33 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2010-09-08 09:37:33 +0000 |
commit | 806ee79a7be5ca0dcb0e03d16021ed5eb92f0f27 (patch) | |
tree | ce2fc09c394b2d78cce1b9e2a876a49ea592f394 /engines/groovie/groovie.cpp | |
parent | 690fea29333daadd79d7bc305ee7fff040613b9f (diff) | |
download | scummvm-rg350-806ee79a7be5ca0dcb0e03d16021ed5eb92f0f27.tar.gz scummvm-rg350-806ee79a7be5ca0dcb0e03d16021ed5eb92f0f27.tar.bz2 scummvm-rg350-806ee79a7be5ca0dcb0e03d16021ed5eb92f0f27.zip |
GROOVIE: Improve sound handling.
- Obey the mute setting.
- Report the supported music types.
svn-id: r52633
Diffstat (limited to 'engines/groovie/groovie.cpp')
-rw-r--r-- | engines/groovie/groovie.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index cdf5171ab9..131604e75c 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -321,13 +321,18 @@ void GroovieEngine::errorString(const char *buf_input, char *buf_output, int buf } void GroovieEngine::syncSoundSettings() { - _musicPlayer->setUserVolume(ConfMan.getInt("music_volume")); - // VDX videos just contain one digital audio track, which can be used for + bool mute = ConfMan.getBool("mute"); + + // Set the music volume + _musicPlayer->setUserVolume(mute ? 0 : ConfMan.getInt("music_volume")); + + // Videos just contain one digital audio track, which can be used for // both SFX or Speech, but the engine doesn't know what they contain, so // we have to use just one volume setting for videos. // We use "speech" because most users will want to change the videos // volume when they can't hear the speech because of the music. - _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("speech_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, + mute ? 0 : ConfMan.getInt("speech_volume")); } bool GroovieEngine::canLoadGameStateCurrently() { |