[Scummvm-cvs-logs] SF.net SVN: scummvm:[41281] scummvm/trunk/gui

[sev at users.sourceforge.net]

Revision: 41281
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41281&view=rev
Author:   sev
Date:     2009-06-06 18:21:07 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Disable MIDI controls if GUIO_NOMIDI is set

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp
    scummvm/trunk/gui/options.cpp
    scummvm/trunk/gui/options.h

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2009-06-06 18:11:05 UTC (rev 41280)
+++ scummvm/trunk/gui/launcher.cpp	2009-06-06 18:21:07 UTC (rev 41281)
@@ -230,6 +230,9 @@
 
 	_globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);
 
+	if (_guioptions & Common::GUIO_NOMIDI)
+		_globalMIDIOverride->setEnabled(false);
+
 	addMIDIControls(tab, "GameOptions_MIDI.");
 
 	//

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2009-06-06 18:11:05 UTC (rev 41280)
+++ scummvm/trunk/gui/options.cpp	2009-06-06 18:21:07 UTC (rev 41281)
@@ -509,6 +509,9 @@
 }
 
 void OptionsDialog::setMIDISettingsState(bool enabled) {
+	if (_guioptions & Common::GUIO_NOMIDI)
+		enabled = false;
+
 	_enableMIDISettings = enabled;
 
 	_soundFontButton->setEnabled(enabled);

Modified: scummvm/trunk/gui/options.h
===================================================================
--- scummvm/trunk/gui/options.h	2009-06-06 18:11:05 UTC (rev 41280)
+++ scummvm/trunk/gui/options.h	2009-06-06 18:21:07 UTC (rev 41281)
@@ -153,6 +153,7 @@
 
 	CheckboxWidget *_muteCheckbox;
 
+protected:
 	//
 	// Game GUI options
 	//


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.