[Scummvm-cvs-logs] SF.net SVN: scummvm:[43333] scummvm/branches/branch-1-0-0/engines/kyra/ sound_midi.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Aug 13 01:18:05 CEST 2009
Revision: 43333
http://scummvm.svn.sourceforge.net/scummvm/?rev=43333&view=rev
Author: lordhoto
Date: 2009-08-12 23:18:05 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Backport of r43332: "Properly respect users sfx/music config settings for MIDI output.".
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/engines/kyra/sound_midi.cpp
Modified: scummvm/branches/branch-1-0-0/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/sound_midi.cpp 2009-08-12 23:16:35 UTC (rev 43332)
+++ scummvm/branches/branch-1-0-0/engines/kyra/sound_midi.cpp 2009-08-12 23:18:05 UTC (rev 43333)
@@ -658,6 +658,9 @@
}
void SoundMidiPC::playTrack(uint8 track) {
+ if (!_musicEnabled)
+ return;
+
haltTrack();
Common::StackLock lock(_mutex);
@@ -685,6 +688,9 @@
}
void SoundMidiPC::playSoundEffect(uint8 track) {
+ if (!_sfxEnabled)
+ return;
+
Common::StackLock lock(_mutex);
for (int i = 0; i < 3; ++i) {
if (!_sfx[i]->isPlaying()) {
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