[Scummvm-cvs-logs] SF.net SVN: scummvm:[52774] scummvm/branches/branch-1-2-0/sound/mididrv.cpp

[wjpalenstijn at users.sourceforge.net]

Revision: 52774
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52774&view=rev
Author:   wjpalenstijn
Date:     2010-09-17 19:15:48 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
MIDI: Ignore MDT_PREFER_MT32 and MDT_PREFER_GM

This is a branch-specific hack to prevent unusable devices
(such as the mt32emu without roms present) from being selected
by default. To be fixed properly on trunk.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/sound/mididrv.cpp

Modified: scummvm/branches/branch-1-2-0/sound/mididrv.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/sound/mididrv.cpp	2010-09-17 19:13:47 UTC (rev 52773)
+++ scummvm/branches/branch-1-2-0/sound/mididrv.cpp	2010-09-17 19:15:48 UTC (rev 52774)
@@ -129,6 +129,12 @@
 	// Query the selected music device (defaults to MT_AUTO device).
 	DeviceHandle hdl = getDeviceHandle(ConfMan.get("music_driver"));
 
+	// HACK: disable PREFER_GM and PREFER_MT32 since they can result in
+	// unusable devices (such as the mt32emu without ROMs) being selected
+	// by default for certain games.
+	flags &= ~(MDT_PREFER_GM | MDT_PREFER_MT32);
+
+
 	_forceTypeMT32 = false;
 
 	// Check whether the selected music driver is compatible with the


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