From ac62a7cb2e17a86350681366d768a99db3b9845d Mon Sep 17 00:00:00 2001 From: Ludvig Strigeus Date: Sun, 14 Apr 2002 18:13:08 +0000 Subject: wrote new mixer class, cleaned up sound header files, integrated mixer into scummvm & simon svn-id: r3937 --- sound/mididrv.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) (limited to 'sound/mididrv.cpp') diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 7a881e7cb1..b8d365be29 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -30,11 +30,9 @@ #include #endif - #include "stdafx.h" #include "scumm.h" -#include "gmidi.h" - +#include "mididrv.h" #ifdef WIN32 @@ -326,9 +324,6 @@ const char *MidiDriver::get_error_name(int error_code) { #if 0 - - - void MidiDriver::midiInit() { if (MidiInitialized != true) { @@ -686,4 +681,51 @@ void MidiDriver::midiInitNull() warning ("Music not enabled - MIDI support selected with no MIDI driver available. Try Adlib"); } -#endif \ No newline at end of file + + + +/* old header stuff.. */ +/* General Midi header file */ +#define SEQ_MIDIPUTC 5 +#define SPECIAL_CHANNEL 9 +#define DEVICE_NUM 0 + + + +#ifdef __APPLE__CW + #include + #include "QuickTimeMusic.h" + + NoteAllocator qtNoteAllocator; + NoteChannel qtNoteChannel[16]; + NoteRequest simpleNoteRequest; +#endif + +#ifdef WIN32 + #include +#elif defined(UNIX) + #include + #include + #include + #include + #include + #include + #include + #include + #include +#endif + +#ifdef __MORPHOS__ + #include + #include + + #define NO_PPCINLINE_STDARG + #define NO_PPCINLINE_VARARGS + #include + #include + #undef CMD_INVALID + + extern struct IOMidiRequest *ScummMidiRequest; +#endif + +#endif /* 0 */ \ No newline at end of file -- cgit v1.2.3