mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-14 21:59:17 +00:00
Properly respect users sfx/music config settings for MIDI output.
svn-id: r43332
This commit is contained in:
parent
71750b6d06
commit
57566ad337
@ -658,6 +658,9 @@ void SoundMidiPC::loadSfxFile(Common::String file) {
|
||||
}
|
||||
|
||||
void SoundMidiPC::playTrack(uint8 track) {
|
||||
if (!_musicEnabled)
|
||||
return;
|
||||
|
||||
haltTrack();
|
||||
|
||||
Common::StackLock lock(_mutex);
|
||||
@ -685,6 +688,9 @@ bool SoundMidiPC::isPlaying() {
|
||||
}
|
||||
|
||||
void SoundMidiPC::playSoundEffect(uint8 track) {
|
||||
if (!_sfxEnabled)
|
||||
return;
|
||||
|
||||
Common::StackLock lock(_mutex);
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
if (!_sfx[i]->isPlaying()) {
|
||||
|
Loading…
Reference in New Issue
Block a user