[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.39,1.40

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv4359

Modified Files:
	mididrv.cpp 
Log Message:
Moved MorphOS midi driver to backends/midi

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mididrv.cpp	18 Dec 2002 07:48:02 -0000	1.39
+++ mididrv.cpp	25 Dec 2002 12:01:37 -0000	1.40
@@ -21,7 +21,6 @@
 
 /*
  * Raw output support by Michael Pearce
- * MorphOS support by Ruediger Hanke 
  * Alsa support by Nicolas Noble <nicolas at nobis-crew.org> copied from
  *    both the QuickTime support and (vkeybd http://www.alsa-project.org/~iwai/alsa.html)
  */
@@ -56,81 +55,6 @@
 		return "Unknown Error";
 	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