mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-24 05:01:43 +00:00
Queen sound settings are now configurable through the GMM
svn-id: r32922
This commit is contained in:
parent
a14a0d16c1
commit
6d1350638a
@ -180,6 +180,10 @@ void QueenEngine::checkOptionSettings() {
|
||||
}
|
||||
}
|
||||
|
||||
void QueenEngine::syncSoundSettings() {
|
||||
_sound->setVolume(ConfMan.getInt("music_volume"));
|
||||
}
|
||||
|
||||
void QueenEngine::readOptionSettings() {
|
||||
_sound->setVolume(ConfMan.getInt("music_volume"));
|
||||
_sound->musicToggle(!ConfMan.getBool("music_mute"));
|
||||
|
@ -97,6 +97,7 @@ public:
|
||||
void checkOptionSettings();
|
||||
void readOptionSettings();
|
||||
void writeOptionSettings();
|
||||
virtual void syncSoundSettings();
|
||||
|
||||
int talkSpeed() const { return _talkSpeed; }
|
||||
void talkSpeed(int speed) { _talkSpeed = speed; }
|
||||
|
@ -224,8 +224,7 @@ void PCSound::playSpeech(const char *base) {
|
||||
|
||||
void PCSound::setVolume(int vol) {
|
||||
Sound::setVolume(vol);
|
||||
// Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages
|
||||
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
|
||||
_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol);
|
||||
_music->setVolume(vol);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user