[Scummvm-cvs-logs] SF.net SVN: scummvm:[43332] scummvm/trunk/engines/kyra/sound_midi.cpp

[lordhoto at users.sourceforge.net]

Revision: 43332
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43332&view=rev
Author:   lordhoto
Date:     2009-08-12 23:16:35 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Properly respect users sfx/music config settings for MIDI output.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_midi.cpp

Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp	2009-08-12 23:07:41 UTC (rev 43331)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp	2009-08-12 23:16:35 UTC (rev 43332)
@@ -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.