[Scummvm-cvs-logs] SF.net SVN: scummvm:[50649] scummvm/trunk/gui/options.cpp

[lordhoto at users.sourceforge.net]

Revision: 50649
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50649&view=rev
Author:   lordhoto
Date:     2010-07-04 18:03:18 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Prevent the MT-32 Emulator from being displayed in the "GM Device" pop up.

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

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-07-04 18:00:46 UTC (rev 50648)
+++ scummvm/trunk/gui/options.cpp	2010-07-04 18:03:18 UTC (rev 50649)
@@ -678,9 +678,10 @@
 			    || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device
 					_midiPopUp->appendEntry(d->getCompleteName(), musicId++);
 
-			if (d->getMusicType() >= MT_GM || m == p.begin()) {
+			if (d->getMusicType() >= MT_GM || d->getMusicDriverId() == "auto") {
 				_mt32DevicePopUp->appendEntry(d->getCompleteName(), midiId);
-				_gmDevicePopUp->appendEntry(d->getCompleteName(), midiId++);
+				if (d->getMusicType() != MT_MT32)
+					_gmDevicePopUp->appendEntry(d->getCompleteName(), midiId++);
 			}
 		}
 	}


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