[Scummvm-cvs-logs] SF.net SVN: scummvm: [20524] scummvm/trunk/sound/mididrv.cpp

[chrilith at users.sourceforge.net]

Revision: 20524
Author:   chrilith
Date:     2006-02-11 02:57:07 -0800 (Sat, 11 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20524&view=rev

Log Message:
-----------
- Use midi drivers only when needed
- disable zodiac midi driver with scumm engine since it doesn't work with it in ARM mode (??)

Modified Paths:
--------------
    scummvm/trunk/sound/mididrv.cpp
Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp	2006-02-11 10:54:21 UTC (rev 20523)
+++ scummvm/trunk/sound/mididrv.cpp	2006-02-11 10:57:07 UTC (rev 20524)
@@ -57,8 +57,11 @@
 #endif
 
 #if defined(PALMOS_MODE)
+#	if defined(COMPILE_CLIE)
 	{"ypa1", "Yamaha Pa1", MD_YPA1, MDT_MIDI},
+#	elif defined(COMPILE_ZODIAC) && (defined(DISABLE_SCUMM) || !defined(PALMOS_ARM))
 	{"zodiac", "Tapwave Zodiac", MD_ZODIAC, MDT_MIDI},
+#	endif
 #endif
 
 #if defined(__MORPHOS__)
@@ -229,7 +232,7 @@
 #if defined(PALMOS_MODE)
 #if defined(COMPILE_CLIE)
 	case MD_YPA1:      return MidiDriver_YamahaPa1_create();
-#elif defined(COMPILE_ZODIAC)
+#elif defined(COMPILE_ZODIAC) && (defined(DISABLE_SCUMM) || !defined(PALMOS_ARM))
 	case MD_ZODIAC:    return MidiDriver_Zodiac_create();
 #endif
 #endif
@@ -256,4 +259,3 @@
 	error("Invalid midi driver selected");
 	return NULL;
 }
-