aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorChris Apers2004-02-05 13:56:39 +0000
committerChris Apers2004-02-05 13:56:39 +0000
commit2420bf29003bd9ea07337638c233333776423758 (patch)
tree19339ebbe5b1df1c826274c406ac2939b1a412d5 /backends
parentacbb4b98b62833dbc7bedc0f226aada8523cccab (diff)
downloadscummvm-rg350-2420bf29003bd9ea07337638c233333776423758.tar.gz
scummvm-rg350-2420bf29003bd9ea07337638c233333776423758.tar.bz2
scummvm-rg350-2420bf29003bd9ea07337638c233333776423758.zip
Prepare Zodiac MIDI support
svn-id: r12734
Diffstat (limited to 'backends')
-rw-r--r--backends/PalmOS/Src/launch.cpp13
-rw-r--r--backends/PalmOS/Src/midi/adlib.cpp6
-rw-r--r--backends/midi/zodiac.cpp27
3 files changed, 43 insertions, 3 deletions
diff --git a/backends/PalmOS/Src/launch.cpp b/backends/PalmOS/Src/launch.cpp
index 699c92b4f6..570f9b42a3 100644
--- a/backends/PalmOS/Src/launch.cpp
+++ b/backends/PalmOS/Src/launch.cpp
@@ -201,12 +201,15 @@ Boolean StartScummVM() {
case 1: // yamaha Pa1
AddArg(&argvP[argc], "-e", "ypa1", &argc);
break;
- case 2: // PC Speaker
+ case 2: // Tapwave Zodiac
+ AddArg(&argvP[argc], "-e", "zodiac", &argc);
+ break;
+ case 3: // PC Speaker
AddArg(&argvP[argc], "-e", "pcspk", &argc);
break;
- case 3: // IBM PCjr
+ case 4: // IBM PCjr
AddArg(&argvP[argc], "-e", "pcjr", &argc);
- case 4: // FM Towns
+ case 5: // FM Towns
AddArg(&argvP[argc], "-e", "towns", &argc);
}
}
@@ -282,6 +285,7 @@ Boolean StartScummVM() {
VFSFileCreate(gVars->volRefNum,"PALM/Programs/ScummVM/scumm.log");
VFSFileOpen(gVars->volRefNum,"PALM/Programs/ScummVM/scumm.log",vfsModeWrite, &gVars->logFile);
+ // TODO : move this to ypa1.cpp (?)
void *sndStateOnFuncP = NULL,
*sndStateOffFuncP = NULL;
@@ -302,12 +306,14 @@ Boolean StartScummVM() {
Pa1Lib_devHpVolume(gPrefs->volume.headphone, gPrefs->volume.headphone);
Pa1Lib_devSpVolume(gPrefs->volume.speaker);
}
+ //
SavePrefs(); // free globals pref memory
GlbOpen();
main(argc, argvP);
GlbClose();
+ // TODO : move this to ypa1.cpp (?)
if (musicDriver == 1 || musicDriver == sysInvalidRefNum) {
if (sndStateOnFuncP && sndStateOffFuncP) {
((sndStateOffType)(sndStateOffFuncP))(aOutSndKindSp);
@@ -316,6 +322,7 @@ Boolean StartScummVM() {
Pa1Lib_Close();
}
+ //
// close log file
VFSFileClose(gVars->logFile);
diff --git a/backends/PalmOS/Src/midi/adlib.cpp b/backends/PalmOS/Src/midi/adlib.cpp
index 5a290ed3e4..a794bf0afd 100644
--- a/backends/PalmOS/Src/midi/adlib.cpp
+++ b/backends/PalmOS/Src/midi/adlib.cpp
@@ -31,3 +31,9 @@ public:
MidiDriver *MidiDriver_ADLIB_create(SoundMixer *mixer) {
return new MidiDriver_ADLIB();
}
+
+#ifdef DISABLE_TAPWAVE
+MidiDriver *MidiDriver_Zodiac_create() {
+ return new MidiDriver_ADLIB();
+}
+#endif \ No newline at end of file
diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp
new file mode 100644
index 0000000000..c712a92208
--- /dev/null
+++ b/backends/midi/zodiac.cpp
@@ -0,0 +1,27 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2004 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 "stdafx.h"
+#include "sound/mpu401.h"
+#include "common/util.h"
+
+#ifndef DISABLE_TAPWAVE
+// Tapwave code will come here
+#endif