Renamed new AMidi to Etude

svn-id: r5079

7 files changed, 199 insertions, 51 deletions

diff --git a/backends/morphos/MorphOS.readme b/backends/morphos/MorphOS.readme
index 693ae324c4..201c8f32b8 100644
--- a/backends/morphos/MorphOS.readme
+++ b/backends/morphos/MorphOS.readme
@@ -1,7 +1,7 @@
 This directory contains the source for the MorphOS port of ScummVM. To build, you
-must have a proper Geek Gadgets installation. Just type "make" in the MorphOS
-subdirectory. If you don't have the includes for AMidi 2 and cdda.library, check
-my webpage. If they aren't uploaded yet, feel free to e-mail me.
+must have a proper Geek Gadgets installation. If you don't have the includes for
+Etude and cdda.library, check my webpage. If they aren't uploaded yet, feel free
+to e-mail me.
 
 You don't have to build ScummVM yourself. The latest official and CVS binaries are
 available from my website at:
diff --git a/backends/morphos/morphos_sound.cpp b/backends/morphos/morphos_sound.cpp
index d11fb21339..73f7bea3ae 100644
--- a/backends/morphos/morphos_sound.cpp
+++ b/backends/morphos/morphos_sound.cpp
@@ -27,7 +27,7 @@
 #include <dos/dos.h>
 #include <exec/memory.h>
 #include <devices/ahi.h>
-#include <devices/amidi.h>
+#include <devices/etude.h>
 
 #include <clib/alib_protos.h>
 #include <proto/exec.h>
@@ -53,43 +53,40 @@ static char			*ahiBuf[2]	   = { NULL, NULL };
 static MsgPort 	   *ScummMidiPort = NULL;
 		 IOMidiRequest *ScummMidiRequest = NULL;
 
-		 Device        *AMidiBase = NULL;
+		 Device        *EtudeBase = NULL;
 
-bool init_morphos_music(ULONG MidiUnit)
+bool init_morphos_music(ULONG MidiUnit, ULONG DevFlags)
 {
-	if (ScummMusicDriver && !stricmp(ScummMusicDriver, "-eamidi"))	  // just as ugly as the line below ...
+	MidiUnit = ScummMidiUnit;	// Ugly fix, but ...
+	ScummMidiPort = CreateMsgPort();
+	if (ScummMidiPort)
 	{
-		MidiUnit = ScummMidiUnit;	// Ugly fix, but ...
-		ScummMidiPort = CreateMsgPort();
-		if (ScummMidiPort)
+		ScummMidiRequest = (IOMidiRequest *) CreateIORequest(ScummMidiPort, sizeof (IOMidiRequest));
+		if (ScummMidiRequest)
 		{
-			ScummMidiRequest = (IOMidiRequest *) CreateIORequest(ScummMidiPort, sizeof (IOMidiRequest));
-			if (ScummMidiRequest)
-			{
-				ScummMidiRequest->amr_Version = 2;
-				if (OpenDevice("amidi.device", MidiUnit, (IORequest *) ScummMidiRequest, 0))
-				{
-					DeleteIORequest((IORequest *) ScummMidiRequest);
-					DeleteMsgPort(ScummMidiPort);
-					ScummMidiRequest = NULL;
-					ScummMidiPort = NULL;
-				}
-				AMidiBase = ScummMidiRequest->amr_Std.io_Device;
-			}
-			else
+			ScummMidiRequest->emr_Version = 1;
+			if (OpenDevice(ETUDENAME, MidiUnit, (IORequest *) ScummMidiRequest, DevFlags))
 			{
+				DeleteIORequest((IORequest *) ScummMidiRequest);
 				DeleteMsgPort(ScummMidiPort);
+				ScummMidiRequest = NULL;
 				ScummMidiPort = NULL;
 			}
+			EtudeBase = ScummMidiRequest->emr_Std.io_Device;
 		}
-
-		if (!ScummMidiRequest)
+		else
 		{
-			warning("Could not open AMidi - music will not play");
-			return false;
+			DeleteMsgPort(ScummMidiPort);
+			ScummMidiPort = NULL;
 		}
 	}
 
+	if (!ScummMidiRequest)
+	{
+		warning("Could not open Etude - music will not play");
+		return false;
+	}
+
 	return true;
 }
 
@@ -101,7 +98,9 @@ void exit_morphos_music()
 		CloseDevice((IORequest *) ScummMidiRequest);
 		DeleteIORequest((IORequest *) ScummMidiRequest);
 		DeleteMsgPort(ScummMidiPort);
-		AMidiBase = NULL;
+		ScummMidiRequest = NULL;
+		ScummMidiPort = NULL;
+		EtudeBase = NULL;
 	}
 }
 
diff --git a/backends/morphos/morphos_sound.h b/backends/morphos/morphos_sound.h
index fd40b77748..fac6d15899 100644
--- a/backends/morphos/morphos_sound.h
+++ b/backends/morphos/morphos_sound.h
@@ -25,12 +25,12 @@
 #define MORPHOS_SOUND_H
 
 #include <exec/semaphores.h>
-#include <devices/amidi.h>
+#include <devices/etude.h>
 
 class OSystem_MorphOS;
 
 int morphos_sound_thread(OSystem_MorphOS *syst, ULONG SampleType);
-bool init_morphos_music(ULONG MidiUnit);
+bool init_morphos_music(ULONG MidiUnit, ULONG DevFlags);
 void exit_morphos_music();
 
 extern SignalSemaphore ScummMusicThreadRunning;
diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp
index 82c582d84a..ead98ce614 100644
--- a/backends/morphos/morphos_start.cpp
+++ b/backends/morphos/morphos_start.cpp
@@ -117,7 +117,7 @@ void close_resources()
 static STRPTR FindMusicDriver(STRPTR argval)
 {
 	if (!stricmp(argval, "off"))  	return "-enull";
-	if (!stricmp(argval, "midi"))	 	return "-eamidi";
+	if (!stricmp(argval, "midi"))	 	return "-eetude";
 	if (!stricmp(argval, "midiemu"))	return "-emidiemu";
 	if (!stricmp(argval, "adlib")) 	return "-eadlib";
 
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 7a2fcdb3d8..d63605d105 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -362,7 +362,7 @@ bool GameDetector::parseMusicDriver(const char *s) {
 		{"seq",MD_SEQ},
 		{"qt",MD_QTMUSIC},
 		{"core",MD_COREAUDIO},
-		{"amidi",MD_AMIDI},
+		{"etude",MD_ETUDE},
 		{"midiemu",MD_MIDIEMU},
 		{"alsa", MD_ALSA},
 		{"adlib",-1},
@@ -600,6 +600,8 @@ MidiDriver *GameDetector::createMidi() {
 #elif defined(__APPLE__) || defined(macintosh)
 	/* MD_QTMUSIC is default MidiDriver on MacOS targets */
 	if (drv == MD_AUTO) drv = MD_QTMUSIC;
+#elif defined(__MORPHOS__)
+	if (drv == MD_AUTO) drv = MD_ETUDE;
 #endif
 
 	switch(drv) {
@@ -609,7 +611,7 @@ MidiDriver *GameDetector::createMidi() {
 	case MD_WINDOWS:	return MidiDriver_WIN_create();
 #endif
 #if defined(__MORPHOS__)
-	case MD_AMIDI:		return MidiDriver_AMIDI_create();
+	case MD_ETUDE:		return MidiDriver_ETUDE_create();
 #endif
 #if defined(UNIX) && !defined(__BEOS__)
 	case MD_SEQ:		return MidiDriver_SEQ_create();
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index b7e1926089..2d06462711 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -181,8 +181,8 @@ void MidiDriver_WIN::fill_all()
 					error("Invalid event type passed");
 				}
 
-				/* increase stream pointer by 12 bytes 
-				 * (need to be 12 bytes, and sizeof(MIDIEVENT) is 16) 
+				/* increase stream pointer by 12 bytes
+				 * (need to be 12 bytes, and sizeof(MIDIEVENT) is 16)
 				 */
 				ev = (MIDIEVENT *)((byte *)ev + 12);
 			}
@@ -299,17 +299,18 @@ MidiDriver *MidiDriver_WIN_create()
 #endif // WIN32
 
 #ifdef __MORPHOS__
+#include <exec/memory.h>
 #include <exec/types.h>
-#include <devices/amidi.h>
+#include <devices/etude.h>
 
 #include <clib/alib_protos.h>
 #include <proto/exec.h>
-#include <proto/amidi.h>
+#include <proto/etude.h>
 
 #include "morphos_sound.h"
 
 /* MorphOS MIDI driver */
-class MidiDriver_AMIDI:public MidiDriver {
+class MidiDriver_ETUDE:public MidiDriver {
 public:
 	int open(int mode);
 	void close();
@@ -318,34 +319,94 @@ public:
 	void set_stream_callback(void *param, StreamCallback *sc);
 
 private:
+	enum {
+		NUM_BUFFERS = 2,
+		MIDI_EVENT_SIZE = 64,
+		BUFFER_SIZE = MIDI_EVENT_SIZE * 12,
+	};
+
+	static void midi_callback(ULONG msg, struct IOMidiRequest *req, APTR user_data);
+	void fill_all();
+	uint32 property(int prop, uint32 param);
+
 	StreamCallback *_stream_proc;
 	void *_stream_param;
+	IOMidiRequest *_stream_req[NUM_BUFFERS];
+	void *_stream_buf[NUM_BUFFERS];
+	bool _req_sent[NUM_BUFFERS];
 	int _mode;
+	uint16 _time_div;
 };
 
-void MidiDriver_AMIDI::set_stream_callback(void *param, StreamCallback *sc)
+void MidiDriver_ETUDE::set_stream_callback(void *param, StreamCallback *sc)
 {
 	_stream_param = param;
 	_stream_proc = sc;
 }
 
-int MidiDriver_AMIDI::open(int mode)
+int MidiDriver_ETUDE::open(int mode)
 {
+	if (_mode != 0)
+		return MERR_ALREADY_OPEN;
 	_mode = mode;
-	init_morphos_music(0);
+	if (!init_morphos_music(0, _mode == MO_STREAMING ? ETUDEF_STREAMING : ETUDEF_DIRECT))
+		return MERR_DEVICE_NOT_AVAILABLE;
+
+	if (_mode == MO_STREAMING && ScummMidiRequest) {
+		_stream_req[0] = ScummMidiRequest;
+		_stream_req[1] = (IOMidiRequest *) AllocVec(sizeof (IOMidiRequest), MEMF_PUBLIC);
+		_stream_buf[0] = AllocVec(BUFFER_SIZE, MEMF_PUBLIC);
+		_stream_buf[1] = AllocVec(BUFFER_SIZE, MEMF_PUBLIC);
+		_req_sent[0] = _req_sent[1] = false;
+
+		if (_stream_req[1] == NULL || _stream_buf[0] == NULL || _stream_buf[1] == NULL) {
+			close();
+			return MERR_DEVICE_NOT_AVAILABLE;
+		}
+
+		if (ScummMidiRequest)
+		{
+			memcpy(_stream_req[1], _stream_req[0], sizeof (IOMidiRequest));
+			struct TagItem MidiStreamTags[] = { { ESA_Callback, (ULONG) &midi_callback },
+															{ ESA_UserData, (ULONG) this },
+															{ ESA_TimeDiv, _time_div },
+															{ TAG_DONE, 0 }
+														 };
+			SetMidiStreamAttrsA(ScummMidiRequest, MidiStreamTags);
+			fill_all();
+		}
+	}
+
 	return 0;
 }
 
-void MidiDriver_AMIDI::close()
+void MidiDriver_ETUDE::close()
 {
+	if (_mode == MO_STREAMING) {
+		if (_req_sent[0]) {
+			AbortIO((IORequest *) _stream_req[0]);
+			WaitIO((IORequest *) _stream_req[0]);
+			_req_sent[0] = false;
+		}
+		if (_req_sent[1]) {
+			AbortIO((IORequest *) _stream_req[1]);
+			WaitIO((IORequest *) _stream_req[1]);
+			_req_sent[1] = false;
+		}
+
+		if (_stream_req[1]) FreeVec(_stream_req[1]);
+		if (_stream_buf[0]) FreeVec(_stream_buf[0]);
+		if (_stream_buf[1]) FreeVec(_stream_buf[1]);
+	}
+
 	exit_morphos_music();
 	_mode = 0;
 }
 
-void MidiDriver_AMIDI::send(uint32 b)
+void MidiDriver_ETUDE::send(uint32 b)
 {
 	if (_mode != MO_SIMPLE)
-		error("MidiDriver_AMIDI:send called but driver is not in simple mode");
+		error("MidiDriver_ETUDE::send called but driver is not in simple mode");
 
 	if (ScummMidiRequest) {
 		ULONG midi_data = READ_LE_UINT32(&b);
@@ -353,15 +414,101 @@ void MidiDriver_AMIDI::send(uint32 b)
 	}
 }
 
-void MidiDriver_AMIDI::pause(bool pause)
+void MidiDriver_ETUDE::midi_callback(ULONG msg, struct IOMidiRequest *req, APTR user_data)
 {
-	if (_mode == MO_STREAMING) {
+	switch (msg) {
+		case ETUDE_STREAM_MSG_BLOCKEND: {
+			MidiDriver_ETUDE *md = ((MidiDriver_ETUDE *) user_data);
+			if (md && md->_mode)
+				md->fill_all();
+			break;
+		}
+	}
+}
+
+void MidiDriver_ETUDE::fill_all()
+{
+	if (_stream_proc == NULL) {
+		error("MidiDriver_ETUDE::fill_all() called, but _stream_proc == NULL");
+	}
+
+	uint buf;
+	MidiEvent my_evs[64];
+
+	for (buf = 0; buf < NUM_BUFFERS; buf++) {
+		if (!_req_sent[buf] || CheckIO((IORequest *) _stream_req[buf])) {
+			int num = _stream_proc(_stream_param, my_evs, 64);
+
+			if (_req_sent[buf]) {
+				WaitIO((IORequest *) _stream_req[buf]);
+				_req_sent[buf] = false;
+			}
+
+			/* end of stream? */
+			if (num == 0)
+				break;
+
+			MIDIEVENT *ev = (MIDIEVENT *) _stream_buf[buf];
+			MidiEvent *my_ev = my_evs;
+
+			for (int i = 0; i < num; i++, my_ev++) {
+				ev->me_StreamID = 0;
+				ev->me_DeltaTime = my_ev->delta;
+
+				switch (my_ev->event >> 24) {
+				case 0:
+					ev->me_Event = my_ev->event;
+					break;
+				case ME_TEMPO:
+					/* change tempo event */
+					ev->me_Event = (MEVT_TEMPO << 24) | (my_ev->event & 0xFFFFFF);
+					break;
+				default:
+					error("Invalid event type passed");
+				}
+
+				/* increase stream pointer by 12 bytes 
+				 * (need to be 12 bytes, and sizeof(MIDIEVENT) is 16) 
+				 */
+				ev = (MIDIEVENT *)((byte *)ev + 12);
+			}
+
+			ConvertWindowsMidiStream(_stream_buf[buf], num * 12);
+
+			_stream_req[buf]->emr_Std.io_Command = CMD_WRITE;
+			_stream_req[buf]->emr_Std.io_Data = _stream_buf[buf];
+			_stream_req[buf]->emr_Std.io_Length = num * 12;
+		   SendIO((IORequest *) _stream_req[buf]);
+			_req_sent[buf] = true;
+		}
+	}
+}
+
+void MidiDriver_ETUDE::pause(bool pause)
+{
+	if (_mode == MO_STREAMING && ScummMidiRequest) {
+		if (pause)
+			PauseMidiStream(ScummMidiRequest);
+		else
+			RestartMidiStream(ScummMidiRequest);
+	}
+}
+
+uint32 MidiDriver_ETUDE::property(int prop, uint32 param)
+{
+	switch (prop) {
+		/* 16-bit time division according to standard midi specification */
+		case PROP_TIMEDIV:
+			_time_div = (uint16)param;
+			return 1;
 	}
+
+	return 0;
 }
 
-MidiDriver *MidiDriver_AMIDI_create()
+MidiDriver *MidiDriver_ETUDE_create()
 {
-	return new MidiDriver_AMIDI();
+	return new MidiDriver_ETUDE();
 }
 
 #endif // __MORPHOS__
diff --git a/sound/mididrv.h b/sound/mididrv.h
index af61dca289..9dc74bd5d8 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -109,7 +109,7 @@ enum {
 	MD_TIMIDITY = 3,
 	MD_SEQ = 4,
 	MD_QTMUSIC = 5,
-	MD_AMIDI = 6,
+	MD_ETUDE = 6,
 	MD_COREAUDIO = 7,
 	MD_MIDIEMU = 8,
 	MD_ALSA = 9,
@@ -124,7 +124,7 @@ extern MidiDriver *MidiDriver_TIMIDITY_create();
 extern MidiDriver *MidiDriver_SEQ_create();
 extern MidiDriver *MidiDriver_QT_create();
 extern MidiDriver *MidiDriver_CORE_create();
-extern MidiDriver *MidiDriver_AMIDI_create();
+extern MidiDriver *MidiDriver_ETUDE_create();
 extern MidiDriver *MidiDriver_MIDIEMU_create();
 extern MidiDriver *MidiDriver_ALSA_create();