[Scummvm-cvs-logs] SF.net SVN: scummvm:[52674] scummvm/trunk/engines/tinsel
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sat Sep 11 07:28:55 CEST 2010
Revision: 52674
http://scummvm.svn.sourceforge.net/scummvm/?rev=52674&view=rev
Author: dreammaster
Date: 2010-09-11 05:28:54 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
TINSEL: Fix for #3032780 - Mute not respected in DW1
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/music.cpp
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/tinsel/tinsel.cpp
Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp 2010-09-11 04:32:53 UTC (rev 52673)
+++ scummvm/trunk/engines/tinsel/music.cpp 2010-09-11 05:28:54 UTC (rev 52674)
@@ -158,7 +158,11 @@
if (TinselV1PSX) return false;
if (_vm->_config->_musicVolume != 0) {
- SetMidiVolume(_vm->_config->_musicVolume);
+ bool mute = false;
+ if (ConfMan.hasKey("mute"))
+ mute = ConfMan.getBool("mute");
+
+ SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume);
}
// the index and length of the last tune loaded
@@ -967,8 +971,12 @@
currentLoop = Loop;
if (_vm->_config->_musicVolume != 0 && Loop) {
+ bool mute = false;
+ if (ConfMan.hasKey("mute"))
+ mute = ConfMan.getBool("mute");
+
PlayMidiSequence(currentMidi, true);
- SetMidiVolume(_vm->_config->_musicVolume);
+ SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume);
}
}
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2010-09-11 04:32:53 UTC (rev 52673)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2010-09-11 05:28:54 UTC (rev 52674)
@@ -129,9 +129,13 @@
error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
// FIXME: Should set this in a different place ;)
- _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_config->_soundVolume);
+ bool mute = false;
+ if (ConfMan.hasKey("mute"))
+ mute = ConfMan.getBool("mute");
+
+ _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, mute ? 0 : _vm->_config->_soundVolume);
//_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
- _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume);
+ _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : _vm->_config->_voiceVolume);
Audio::AudioStream *sampleStream = 0;
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2010-09-11 04:32:53 UTC (rev 52673)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2010-09-11 05:28:54 UTC (rev 52674)
@@ -1169,7 +1169,11 @@
}
// Set midi volume
- SetMidiVolume(_vm->_config->_musicVolume);
+ bool mute = false;
+ if (ConfMan.hasKey("mute"))
+ mute = ConfMan.getBool("mute");
+
+ SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list