libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 15:48:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: Fix mute setting with MIDI and FM-Towns/PC98 output.

Browse Source 
svn-id: r51105
This commit is contained in:
Johannes Schickel 2010-07-21 20:26:40 +00:00
parent 0d1c44301a
commit 44aab95eb9
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/kyra/sound_midi.cpp
View File

@ -573,8 +573,12 @@ void SoundMidiPC::updateVolumeSettings() {
if (!_output)
return;
int newMusVol = ConfMan.getInt("music_volume");
_sfxVolume = ConfMan.getInt("sfx_volume");
bool mute = false;
if (ConfMan.hasKey("mute"))
mute = ConfMan.getBool("mute");
const int newMusVol = (mute ? 0 : ConfMan.getInt("music_volume"));
_sfxVolume = (mute ? 0 : ConfMan.getInt("sfx_volume"));
_output->setSourceVolume(0, newMusVol, newMusVol != _musicVolume);
_musicVolume = newMusVol;

30
engines/kyra/sound_towns.cpp
View File

@ -4254,8 +4254,12 @@ void SoundPC98::updateVolumeSettings() {
if (!_driver)
return;
_driver->setMusicVolume(ConfMan.getInt("music_volume"));
_driver->setSoundEffectVolume(ConfMan.getInt("sfx_volume"));
bool mute = false;
if (ConfMan.hasKey("mute"))
mute = ConfMan.getBool("mute");
_driver->setMusicVolume((mute ? 0 : ConfMan.getInt("music_volume")));
_driver->setSoundEffectVolume((mute ? 0 : ConfMan.getInt("sfx_volume")));
}
// KYRA 2
@ -4456,14 +4460,18 @@ void SoundTownsPC98_v2::updateVolumeSettings() {
if (!_driver)
return;
_driver->setMusicVolume(ConfMan.getInt("music_volume"));
_driver->setSoundEffectVolume(ConfMan.getInt("sfx_volume"));
bool mute = false;
if (ConfMan.hasKey("mute"))
mute = ConfMan.getBool("mute");
_driver->setMusicVolume((mute ? 0 : ConfMan.getInt("music_volume")));
_driver->setSoundEffectVolume((mute ? 0 : ConfMan.getInt("sfx_volume")));
}
// static resources
const uint32 TownsPC98_OpnCore::_adtStat[] = {
0x00010001, 0x00010001, 0x00010001, 0x01010001,
0x00010001, 0x00010001, 0x00010001, 0x01010001,
0x00010101, 0x00010101, 0x00010101, 0x01010101,
0x01010101, 0x01010101, 0x01010102, 0x01010102,
0x01020102, 0x01020102, 0x01020202, 0x01020202,
@ -4477,14 +4485,14 @@ const uint32 TownsPC98_OpnCore::_adtStat[] = {
const uint8 TownsPC98_OpnCore::_detSrc[] = {
0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07,
0x08, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x01,
0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
0x08, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x01,
0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07,
0x08, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
0x10, 0x10, 0x10, 0x10, 0x02, 0x02, 0x02, 0x02,
0x08, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
0x10, 0x10, 0x10, 0x10, 0x02, 0x02, 0x02, 0x02,
0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05,
0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a,
0x0b, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x13, 0x14,
0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a,
0x0b, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x13, 0x14,
0x16, 0x16, 0x16, 0x16
};