[Scummvm-cvs-logs] CVS: scummvm/sound fmopl.cpp,1.32,1.33 mididrv.cpp,1.65,1.66
Chris Apers
chrilith at users.sourceforge.net
Sat Sep 3 11:06:05 CEST 2005
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14484
Modified Files:
fmopl.cpp mididrv.cpp
Log Message:
Change PalmOS ident
Index: fmopl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- fmopl.cpp 30 Jul 2005 21:11:42 -0000 1.32
+++ fmopl.cpp 3 Sep 2005 18:05:19 -0000 1.33
@@ -38,7 +38,7 @@
#include "common/config-manager.h"
#endif
-#if defined(__PALM_OS__)
+#if defined(PALMOS_68K)
#include "arm/native.h"
#include "arm/macros.h"
#endif
@@ -181,7 +181,7 @@
/* envelope output curve table */
/* attack + decay + OFF */
//static int ENV_CURVE[2*EG_ENT+1];
-#ifndef __PALM_OS__
+#ifndef PALMOS_68K
static int ENV_CURVE[2 * 4096 + 1]; // to keep it static ...
#else
static int *ENV_CURVE = NULL; // to keep it static ...
@@ -451,7 +451,7 @@
env_out=OPL_CALC_SLOT(SLOT);
if(env_out < (uint)(EG_ENT - 1)) {
/* PG */
- if(SLOT->vib)
+ if(SLOT->vib)
SLOT->Cnt += (SLOT->Incr * vib / VIB_RATE);
else
SLOT->Cnt += SLOT->Incr;
@@ -487,7 +487,7 @@
inline void OPL_CALC_RH(OPL_CH *CH) {
uint env_tam, env_sd, env_top, env_hh;
int whitenoise = int(oplRnd.getRandomNumber(1) * (WHITE_NOISE_db / EG_STEP));
-
+
int tone8;
OPL_SLOT *SLOT;
@@ -584,7 +584,7 @@
OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0;
for (i = 4; i <= 60; i++){
rate = OPL->freqbase; /* frequency rate */
- if(i < 60)
+ if(i < 60)
rate *= 1.0 + (i & 3) * 0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */
rate *= 1 << ((i >> 2) - 1); /* b2-5 : shift bit */
rate *= (double)(EG_ENT << ENV_BITS);
@@ -604,7 +604,7 @@
int i,j;
double pom;
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
if (!ENV_CURVE)
ENV_CURVE = (int *)calloc(2 * 4096 + 1, sizeof(int));
#endif
@@ -689,7 +689,7 @@
free(SIN_TABLE);
free(AMS_TABLE);
free(VIB_TABLE);
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
free(ENV_CURVE);
ENV_CURVE = NULL;
#endif
@@ -732,7 +732,7 @@
/* ---------- write a OPL registers ---------- */
void OPLWriteReg(FM_OPL *OPL, int r, int v) {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_START(OPLDriverType)
ARM_INIT(COMMON_OPLWRITEREG)
ARM_ADDM(OPL)
@@ -964,7 +964,7 @@
/* ---------- update one of chip ----------- */
void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length) {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_START(OPLDriverType)
ARM_INIT(COMMON_YM3812YPDATEONE)
ARM_ADDM(OPL)
@@ -973,7 +973,7 @@
ARM_CALL(ARM_COMMON, PNO_DATA())
ARM_END();
#endif
-
+
int i;
int data;
int16 *buf = buffer;
@@ -1183,7 +1183,7 @@
}
#endif
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
// HQ is really unstable on PalmOS (at least on ARM),
// don't know why... seems to read out of buffer ...
env_bits = FMOPL_ENV_BITS_MQ;
@@ -1200,3 +1200,4 @@
OPLBuildTables(env_bits, eg_ent);
return OPLCreate(OPL_TYPE_YM3812, 3579545, rate);
}
+
Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- mididrv.cpp 30 Jul 2005 21:11:43 -0000 1.65
+++ mididrv.cpp 3 Sep 2005 18:05:19 -0000 1.66
@@ -1,220 +1,222 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001 Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-
-#include "common/stdafx.h"
-
-#include "base/engine.h"
-#include "common/config-manager.h"
-#include "common/str.h"
-#include "common/util.h"
-#include "sound/mididrv.h"
-
-/** Internal list of all available 'midi' drivers. */
-static const struct MidiDriverDescription midiDrivers[] = {
- {"auto", "Default", MD_AUTO},
- {"null", "No music", MD_NULL},
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
- {"windows", "Windows MIDI", MD_WINDOWS},
-#endif
-
-#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX)
- {"seq", "SEQ", MD_SEQ},
-#endif
-
-#if defined(MACOSX)
- {"qt", "QuickTime", MD_QTMUSIC},
- {"core", "CoreAudio", MD_COREAUDIO},
-#endif
-
-#if defined(__MORPHOS__)
- {"etude", "Etude", MD_ETUDE},
-#endif
-
-#if defined(UNIX) && defined(USE_ALSA)
- {"alsa", "ALSA", MD_ALSA},
-#endif
-
- {"adlib", "Adlib", MD_ADLIB},
- {"towns", "FM Towns", MD_TOWNS},
- {"pcspk", "PC Speaker", MD_PCSPK},
- {"pcjr", "IBM PCjr", MD_PCJR},
-#ifdef USE_FLUIDSYNTH
- {"fluidsynth", "FluidSynth", MD_FLUIDSYNTH},
-#endif
-#ifdef USE_MT32EMU
- {"mt32", "MT-32", MD_MT32},
-#endif
-
-#if defined(__PALM_OS__)
- {"ypa1", "Yamaha Pa1", MD_YPA1},
- {"zodiac", "Tapwave Zodiac", MD_ZODIAC},
-#endif
- {0, 0, 0}
-};
-
-const byte MidiDriver::_mt32ToGm[128] = {
-// 0 1 2 3 4 5 6 7 8 9 A B C D E F
- 0, 1, 0, 2, 4, 4, 5, 3, 16, 17, 18, 16, 16, 19, 20, 21, // 0x
- 6, 6, 6, 7, 7, 7, 8, 112, 62, 62, 63, 63, 38, 38, 39, 39, // 1x
- 88, 95, 52, 98, 97, 99, 14, 54, 102, 96, 53, 102, 81, 100, 14, 80, // 2x
- 48, 48, 49, 45, 41, 40, 42, 42, 43, 46, 45, 24, 25, 28, 27, 104, // 3x
- 32, 32, 34, 33, 36, 37, 35, 35, 79, 73, 72, 72, 74, 75, 64, 65, // 4x
- 66, 67, 71, 71, 68, 69, 70, 22, 56, 59, 57, 57, 60, 60, 58, 61, // 5x
- 61, 11, 11, 98, 14, 9, 14, 13, 12, 107, 107, 77, 78, 78, 76, 76, // 6x
- 47, 117, 127, 118, 118, 116, 115, 119, 115, 112, 55, 124, 123, 0, 14, 117 // 7x
-};
-
-const byte MidiDriver::_gmToMt32[128] = {
-// 0 1 2 3 4 5 6 7 8 9 A B C D E F
- 5, 1, 2, 7, 3, 5, 16, 21, 22, 101, 101, 97, 104, 103, 102, 20, // 0x
- 8, 9, 11, 12, 14, 15, 87, 15, 59, 60, 61, 62, 67, 44, 79, 23, // 1x
- 64, 67, 66, 70, 68, 69, 28, 31, 52, 54, 55, 56, 49, 51, 57, 112, // 2x
- 48, 50, 45, 26, 34, 35, 45, 122, 89, 90, 94, 81, 92, 95, 24, 25, // 3x
- 80, 78, 79, 78, 84, 85, 86, 82, 74, 72, 76, 77, 110, 107, 108, 76, // 4x
- 47, 44, 111, 45, 44, 34, 44, 30, 32, 33, 88, 34, 35, 35, 38, 33, // 5x
- 41, 36, 100, 37, 40, 34, 43, 40, 63, 21, 99, 105, 103, 86, 55, 84, // 6x
- 101, 103, 100, 120, 117, 113, 99, 128, 128, 128, 128, 124, 123, 128, 128, 128, // 7x
-};
-
-const MidiDriverDescription *MidiDriver::getAvailableMidiDrivers() {
- return midiDrivers;
-}
-
-int MidiDriver::parseMusicDriver(const Common::String &str) {
- if (str.isEmpty())
- return -1;
-
- const char *s = str.c_str();
- const MidiDriverDescription *md = getAvailableMidiDrivers();
-
- while (md->name) {
- if (!scumm_stricmp(md->name, s)) {
- return md->id;
- }
- md++;
- }
-
- return -1;
-}
-
-int MidiDriver::detectMusicDriver(int midiFlags) {
- int musicDriver = parseMusicDriver(ConfMan.get("music_driver"));
- /* Use the adlib sound driver if auto mode is selected,
- * and the game is one of those that want adlib as
- * default, OR if the game is an older game that doesn't
- * support anything else anyway. */
- if (musicDriver == MD_AUTO || musicDriver < 0) {
- if (midiFlags & MDT_PREFER_NATIVE) {
- if (musicDriver == MD_AUTO) {
- #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
- musicDriver = MD_WINDOWS; // MD_WINDOWS is default MidiDriver on windows targets
- #elif defined(MACOSX)
- musicDriver = MD_COREAUDIO;
- #elif defined(__PALM_OS__) // must be before mac
- musicDriver = MD_YPA1; // TODO : change this and use Zodiac driver when needed
- #elif defined(__MORPHOS__)
- musicDriver = MD_ETUDE;
- #elif defined(_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND) || defined (__SYMBIAN32__)
- // Always use MIDI emulation via adlib driver on CE and UNIX device
-
- // TODO: We should, for the Unix targets, attempt to detect
- // whether a sequencer is available, and use it instead.
- musicDriver = MD_ADLIB;
- #else
- musicDriver = MD_NULL;
- #endif
- } else
- musicDriver = MD_ADLIB;
- } else
- musicDriver = MD_TOWNS;
- }
- bool nativeMidiDriver =
- (musicDriver != MD_NULL && musicDriver != MD_ADLIB &&
- musicDriver != MD_PCSPK && musicDriver != MD_PCJR &&
- musicDriver != MD_TOWNS);
-
- if (nativeMidiDriver && !(midiFlags & MDT_NATIVE))
- musicDriver = MD_TOWNS;
- if (musicDriver == MD_TOWNS && !(midiFlags & MDT_TOWNS))
- musicDriver = MD_ADLIB;
- if (musicDriver == MD_ADLIB && !(midiFlags & MDT_ADLIB))
- musicDriver = MD_PCJR;
- if ((musicDriver == MD_PCSPK || musicDriver == MD_PCJR) && !(midiFlags & MDT_PCSPK))
- musicDriver = MD_NULL;
-
- return musicDriver;
-}
-
-MidiDriver *MidiDriver::createMidi(int midiDriver) {
- switch(midiDriver) {
- case MD_NULL: return MidiDriver_NULL_create();
-
- // In the case of Adlib, we won't specify anything.
- // IMuse is designed to set up its own Adlib driver
- // if need be, and we only have to specify a native
- // driver.
- case MD_ADLIB: return NULL;
-
-#ifdef USE_FLUIDSYNTH
- case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(g_engine->_mixer);
-#endif
-#ifdef USE_MT32EMU
- case MD_MT32: return MidiDriver_MT32_create(g_engine->_mixer);
-#endif
-
- case MD_TOWNS: return MidiDriver_YM2612_create(g_engine->_mixer);
-
- // Right now PC Speaker and PCjr are handled
- // outside the MidiDriver architecture, so
- // don't create anything for now.
- case MD_PCSPK:
- case MD_PCJR: return NULL;
-#if defined(__PALM_OS__)
- case MD_YPA1: return MidiDriver_YamahaPa1_create();
-#ifndef DISABLE_TAPWAVE
- case MD_ZODIAC: return MidiDriver_Zodiac_create();
-#endif
-#endif
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
- case MD_WINDOWS: return MidiDriver_WIN_create();
-#endif
-#if defined(__MORPHOS__)
- case MD_ETUDE: return MidiDriver_ETUDE_create();
-#endif
-#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX)
- case MD_SEQ: return MidiDriver_SEQ_create();
-#endif
-#if (defined(MACOSX) || defined(macintosh)) && !defined(__PALM_OS__)
- case MD_QTMUSIC: return MidiDriver_QT_create();
-#endif
-#if defined(MACOSX)
- case MD_COREAUDIO: return MidiDriver_CORE_create();
-#endif
-#if defined(UNIX) && defined(USE_ALSA)
- case MD_ALSA: return MidiDriver_ALSA_create();
-#endif
- }
-
- error("Invalid midi driver selected");
- return NULL;
-}
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001-2005 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+#include "common/stdafx.h"
+
+#include "base/engine.h"
+#include "common/config-manager.h"
+#include "common/str.h"
+#include "common/util.h"
+#include "sound/mididrv.h"
+
+/** Internal list of all available 'midi' drivers. */
+static const struct MidiDriverDescription midiDrivers[] = {
+ {"auto", "Default", MD_AUTO},
+ {"null", "No music", MD_NULL},
+
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+ {"windows", "Windows MIDI", MD_WINDOWS},
+#endif
+
+#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX)
+ {"seq", "SEQ", MD_SEQ},
+#endif
+
+#if defined(MACOSX)
+ {"qt", "QuickTime", MD_QTMUSIC},
+ {"core", "CoreAudio", MD_COREAUDIO},
+#endif
+
+#if defined(__MORPHOS__)
+ {"etude", "Etude", MD_ETUDE},
+#endif
+
+#if defined(UNIX) && defined(USE_ALSA)
+ {"alsa", "ALSA", MD_ALSA},
+#endif
+
+ {"adlib", "Adlib", MD_ADLIB},
+ {"towns", "FM Towns", MD_TOWNS},
+ {"pcspk", "PC Speaker", MD_PCSPK},
+ {"pcjr", "IBM PCjr", MD_PCJR},
+#ifdef USE_FLUIDSYNTH
+ {"fluidsynth", "FluidSynth", MD_FLUIDSYNTH},
+#endif
+#ifdef USE_MT32EMU
+ {"mt32", "MT-32", MD_MT32},
+#endif
+
+#if defined(PALMOS_MODE)
+ {"ypa1", "Yamaha Pa1", MD_YPA1},
+ {"zodiac", "Tapwave Zodiac", MD_ZODIAC},
+#endif
+ {0, 0, 0}
+};
+
+const byte MidiDriver::_mt32ToGm[128] = {
+// 0 1 2 3 4 5 6 7 8 9 A B C D E F
+ 0, 1, 0, 2, 4, 4, 5, 3, 16, 17, 18, 16, 16, 19, 20, 21, // 0x
+ 6, 6, 6, 7, 7, 7, 8, 112, 62, 62, 63, 63, 38, 38, 39, 39, // 1x
+ 88, 95, 52, 98, 97, 99, 14, 54, 102, 96, 53, 102, 81, 100, 14, 80, // 2x
+ 48, 48, 49, 45, 41, 40, 42, 42, 43, 46, 45, 24, 25, 28, 27, 104, // 3x
+ 32, 32, 34, 33, 36, 37, 35, 35, 79, 73, 72, 72, 74, 75, 64, 65, // 4x
+ 66, 67, 71, 71, 68, 69, 70, 22, 56, 59, 57, 57, 60, 60, 58, 61, // 5x
+ 61, 11, 11, 98, 14, 9, 14, 13, 12, 107, 107, 77, 78, 78, 76, 76, // 6x
+ 47, 117, 127, 118, 118, 116, 115, 119, 115, 112, 55, 124, 123, 0, 14, 117 // 7x
+};
+
+const byte MidiDriver::_gmToMt32[128] = {
+// 0 1 2 3 4 5 6 7 8 9 A B C D E F
+ 5, 1, 2, 7, 3, 5, 16, 21, 22, 101, 101, 97, 104, 103, 102, 20, // 0x
+ 8, 9, 11, 12, 14, 15, 87, 15, 59, 60, 61, 62, 67, 44, 79, 23, // 1x
+ 64, 67, 66, 70, 68, 69, 28, 31, 52, 54, 55, 56, 49, 51, 57, 112, // 2x
+ 48, 50, 45, 26, 34, 35, 45, 122, 89, 90, 94, 81, 92, 95, 24, 25, // 3x
+ 80, 78, 79, 78, 84, 85, 86, 82, 74, 72, 76, 77, 110, 107, 108, 76, // 4x
+ 47, 44, 111, 45, 44, 34, 44, 30, 32, 33, 88, 34, 35, 35, 38, 33, // 5x
+ 41, 36, 100, 37, 40, 34, 43, 40, 63, 21, 99, 105, 103, 86, 55, 84, // 6x
+ 101, 103, 100, 120, 117, 113, 99, 128, 128, 128, 128, 124, 123, 128, 128, 128, // 7x
+};
+
+const MidiDriverDescription *MidiDriver::getAvailableMidiDrivers() {
+ return midiDrivers;
+}
+
+int MidiDriver::parseMusicDriver(const Common::String &str) {
+ if (str.isEmpty())
+ return -1;
+
+ const char *s = str.c_str();
+ const MidiDriverDescription *md = getAvailableMidiDrivers();
+
+ while (md->name) {
+ if (!scumm_stricmp(md->name, s)) {
+ return md->id;
+ }
+ md++;
+ }
+
+ return -1;
+}
+
+int MidiDriver::detectMusicDriver(int midiFlags) {
+ int musicDriver = parseMusicDriver(ConfMan.get("music_driver"));
+ /* Use the adlib sound driver if auto mode is selected,
+ * and the game is one of those that want adlib as
+ * default, OR if the game is an older game that doesn't
+ * support anything else anyway. */
+ if (musicDriver == MD_AUTO || musicDriver < 0) {
+ if (midiFlags & MDT_PREFER_NATIVE) {
+ if (musicDriver == MD_AUTO) {
+ #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+ musicDriver = MD_WINDOWS; // MD_WINDOWS is default MidiDriver on windows targets
+ #elif defined(MACOSX)
+ musicDriver = MD_COREAUDIO;
+ #elif defined(PALMOS_MODE) // must be before mac
+ musicDriver = MD_YPA1; // TODO : change this and use Zodiac driver when needed
+ #elif defined(__MORPHOS__)
+ musicDriver = MD_ETUDE;
+ #elif defined(_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND) || defined (__SYMBIAN32__)
+ // Always use MIDI emulation via adlib driver on CE and UNIX device
+
+ // TODO: We should, for the Unix targets, attempt to detect
+ // whether a sequencer is available, and use it instead.
+ musicDriver = MD_ADLIB;
+ #else
+ musicDriver = MD_NULL;
+ #endif
+ } else
+ musicDriver = MD_ADLIB;
+ } else
+ musicDriver = MD_TOWNS;
+ }
+ bool nativeMidiDriver =
+ (musicDriver != MD_NULL && musicDriver != MD_ADLIB &&
+ musicDriver != MD_PCSPK && musicDriver != MD_PCJR &&
+ musicDriver != MD_TOWNS);
+
+ if (nativeMidiDriver && !(midiFlags & MDT_NATIVE))
+ musicDriver = MD_TOWNS;
+ if (musicDriver == MD_TOWNS && !(midiFlags & MDT_TOWNS))
+ musicDriver = MD_ADLIB;
+ if (musicDriver == MD_ADLIB && !(midiFlags & MDT_ADLIB))
+ musicDriver = MD_PCJR;
+ if ((musicDriver == MD_PCSPK || musicDriver == MD_PCJR) && !(midiFlags & MDT_PCSPK))
+ musicDriver = MD_NULL;
+
+ return musicDriver;
+}
+
+MidiDriver *MidiDriver::createMidi(int midiDriver) {
+ switch(midiDriver) {
+ case MD_NULL: return MidiDriver_NULL_create();
+
+ // In the case of Adlib, we won't specify anything.
+ // IMuse is designed to set up its own Adlib driver
+ // if need be, and we only have to specify a native
+ // driver.
+ case MD_ADLIB: return NULL;
+
+#ifdef USE_FLUIDSYNTH
+ case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(g_engine->_mixer);
+#endif
+#ifdef USE_MT32EMU
+ case MD_MT32: return MidiDriver_MT32_create(g_engine->_mixer);
+#endif
+
+ case MD_TOWNS: return MidiDriver_YM2612_create(g_engine->_mixer);
+
+ // Right now PC Speaker and PCjr are handled
+ // outside the MidiDriver architecture, so
+ // don't create anything for now.
+ case MD_PCSPK:
+ case MD_PCJR: return NULL;
+#if defined(PALMOS_MODE)
+#if defined(COMPILE_CLIE)
+ case MD_YPA1: return MidiDriver_YamahaPa1_create();
+#elif defined(COMPILE_ZODIAC)
+ case MD_ZODIAC: return MidiDriver_Zodiac_create();
+#endif
+#endif
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+ case MD_WINDOWS: return MidiDriver_WIN_create();
+#endif
+#if defined(__MORPHOS__)
+ case MD_ETUDE: return MidiDriver_ETUDE_create();
+#endif
+#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX)
+ case MD_SEQ: return MidiDriver_SEQ_create();
+#endif
+#if (defined(MACOSX) || defined(macintosh)) && !defined(PALMOS_MODE)
+ case MD_QTMUSIC: return MidiDriver_QT_create();
+#endif
+#if defined(MACOSX)
+ case MD_COREAUDIO: return MidiDriver_CORE_create();
+#endif
+#if defined(UNIX) && defined(USE_ALSA)
+ case MD_ALSA: return MidiDriver_ALSA_create();
+#endif
+ }
+
+ error("Invalid midi driver selected");
+ return NULL;
+}
+
More information about the Scummvm-git-logs
mailing list