aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/midi/morphos.cpp93
-rw-r--r--backends/module.mk1
-rw-r--r--sound/mididrv.cpp76
3 files changed, 94 insertions, 76 deletions
diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp
new file mode 100644
index 0000000000..6fba4a76bf
--- /dev/null
+++ b/backends/midi/morphos.cpp
@@ -0,0 +1,93 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001/2002 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$
+ */
+
+#if defined(__MORPHOS__)
+
+#include <exec/memory.h>
+#include <exec/types.h>
+#include <devices/etude.h>
+
+#include <clib/alib_protos.h>
+#include <proto/exec.h>
+#include <proto/etude.h>
+
+#include "stdafx.h"
+#include "sound/mpu401.h"
+#include "common/engine.h" // For warning/error/debug
+#include "morphos_sound.h"
+
+/*
+ * MorphOS MIDI driver for Etude device
+ */
+
+class MidiDriver_ETUDE : public MidiDriver_MPU401 {
+public:
+ MidiDriver_ETUDE();
+ int open();
+ void close();
+ void send(uint32 b);
+
+private:
+ bool _isOpen;
+};
+
+MidiDriver_ETUDE::MidiDriver_ETUDE()
+{
+ _isOpen = false;
+}
+
+int MidiDriver_ETUDE::open()
+{
+ if (_isOpen)
+ return MERR_ALREADY_OPEN;
+ _isOpen = true;
+ if (!init_morphos_music(0, ETUDEF_DIRECT))
+ return MERR_DEVICE_NOT_AVAILABLE;
+
+ return 0;
+}
+
+void MidiDriver_ETUDE::close()
+{
+ exit_morphos_music();
+ _isOpen = false;
+}
+
+void MidiDriver_ETUDE::send(uint32 b)
+{
+ if (_isOpen)
+ error("MidiDriver_ETUDE::send called but driver was no opened");
+
+ if (ScummMidiRequest) {
+ ULONG midi_data = READ_LE_UINT32(&b);
+ SendShortMidiMsg(ScummMidiRequest, midi_data);
+ }
+}
+
+extern MidiDriver* EtudeMidiDriver;
+
+MidiDriver *MidiDriver_ETUDE_create()
+{
+ if (!EtudeMidiDriver)
+ EtudeMidiDriver = new MidiDriver_ETUDE();
+ return EtudeMidiDriver;
+}
+
+#endif
diff --git a/backends/module.mk b/backends/module.mk
index 4276dbdc80..5251530977 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -6,6 +6,7 @@ MODULE_OBJS = \
backends/fs/windows/windows-fs.o \
backends/midi/adlib.o \
backends/midi/coreaudio.o \
+ backends/midi/morphos.o \
backends/midi/null.o \
backends/midi/quicktime.o \
backends/midi/alsa.o \
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index 5ff7b47207..ab110eb7d4 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -21,7 +21,6 @@
/*
* Raw output support by Michael Pearce
- * MorphOS support by Ruediger Hanke
* Alsa support by Nicolas Noble <nicolas@nobis-crew.org> copied from
* both the QuickTime support and (vkeybd http://www.alsa-project.org/~iwai/alsa.html)
*/
@@ -57,81 +56,6 @@ const char *MidiDriver::getErrorName(int error_code)
return midi_errors[error_code];
}
-#ifdef __MORPHOS__
-#include <exec/memory.h>
-#include <exec/types.h>
-#include <devices/etude.h>
-
-#include <clib/alib_protos.h>
-#include <proto/exec.h>
-#include <proto/etude.h>
-
-#include "morphos_sound.h"
-
-/* MorphOS MIDI driver */
-class MidiDriver_ETUDE : public MidiDriver_MPU401 {
-public:
- MidiDriver_ETUDE();
- int open(int mode);
- void close();
- void send(uint32 b);
-
-private:
- enum {
- NUM_BUFFERS = 2,
- MIDI_EVENT_SIZE = 64,
- BUFFER_SIZE = MIDI_EVENT_SIZE * 12,
- };
-
- uint32 property(int prop, uint32 param);
-
- bool _isOpen;
-};
-
-MidiDriver_ETUDE::MidiDriver_ETUDE()
-{
- _isOpen = false;
-}
-
-int MidiDriver_ETUDE::open()
-{
- if (_isOpen)
- return MERR_ALREADY_OPEN;
- _isOpen = true;
- if (!init_morphos_music(0, ETUDEF_DIRECT))
- return MERR_DEVICE_NOT_AVAILABLE;
-
- return 0;
-}
-
-void MidiDriver_ETUDE::close()
-{
- exit_morphos_music();
- _isOpen = false;
-}
-
-void MidiDriver_ETUDE::send(uint32 b)
-{
- if (_isOpen)
- error("MidiDriver_ETUDE::send called but driver was no opened");
-
- if (ScummMidiRequest) {
- ULONG midi_data = READ_LE_UINT32(&b);
- SendShortMidiMsg(ScummMidiRequest, midi_data);
- }
-}
-
-extern MidiDriver* EtudeMidiDriver = NULL;
-
-MidiDriver *MidiDriver_ETUDE_create()
-{
- if (!EtudeMidiDriver)
- EtudeMidiDriver = new MidiDriver_ETUDE();
- return EtudeMidiDriver;
-}
-
-#endif // __MORPHOS__
-
#if defined(UNIX) && !defined(__BEOS__)
#define SEQ_MIDIPUTC 5
#define SPECIAL_CHANNEL 9