[Scummvm-cvs-logs] SF.net SVN: scummvm:[49785] scummvm/trunk/gui/options.cpp
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Jun 15 12:56:46 CEST 2010
Revision: 49785
http://scummvm.svn.sourceforge.net/scummvm/?rev=49785&view=rev
Author: sev
Date: 2010-06-15 10:56:46 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
GUI: Disable AdLib controls if game does not support it.
Modified Paths:
--------------
scummvm/trunk/gui/options.cpp
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-06-15 10:56:30 UTC (rev 49784)
+++ scummvm/trunk/gui/options.cpp 2010-06-15 10:56:46 UTC (rev 49785)
@@ -493,8 +493,18 @@
_midiPopUpDesc->setEnabled(enabled);
_midiPopUp->setEnabled(enabled);
- _oplPopUpDesc->setEnabled(enabled);
- _oplPopUp->setEnabled(enabled);
+
+ uint32 allFlags = MidiDriver::midiDriverFlags2GUIO(~0ul);
+
+ if (_domain != Common::ConfigManager::kApplicationDomain && // global dialog
+ (_guioptions & allFlags) && // No flags are specified
+ !(_guioptions & Common::GUIO_MIDIADLIB)) {
+ _oplPopUpDesc->setEnabled(false);
+ _oplPopUp->setEnabled(false);
+ } else {
+ _oplPopUpDesc->setEnabled(enabled);
+ _oplPopUp->setEnabled(enabled);
+ }
_outputRatePopUpDesc->setEnabled(enabled);
_outputRatePopUp->setEnabled(enabled);
}
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