diff options
| author | James Brown | 2002-03-21 16:12:02 +0000 |
|---|---|---|
| committer | James Brown | 2002-03-21 16:12:02 +0000 |
| commit | f49bbb0fd8c55e03b573236be853ab023d7c3f93 (patch) | |
| tree | d9dc4f87bb014e16f4e8f54392f8f8721e0e1132 /sound | |
| parent | e141367386e855b5a7a1be45ed248e104c89ef45 (diff) | |
| download | scummvm-rg350-f49bbb0fd8c55e03b573236be853ab023d7c3f93.tar.gz scummvm-rg350-f49bbb0fd8c55e03b573236be853ab023d7c3f93.tar.bz2 scummvm-rg350-f49bbb0fd8c55e03b573236be853ab023d7c3f93.zip | |
Move some box stuff from scumm.h to new boxes.h
Also move some sound-related items from scumm.h to sound.h
svn-id: r3797
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/adlib.cpp | 1 | ||||
| -rw-r--r-- | sound/gmidi.cpp | 1 | ||||
| -rw-r--r-- | sound/gmidi.h | 43 | ||||
| -rw-r--r-- | sound/imuse.cpp | 1 |
4 files changed, 25 insertions, 21 deletions
diff --git a/sound/adlib.cpp b/sound/adlib.cpp index 5b54aa40b7..57036fd1e4 100644 --- a/sound/adlib.cpp +++ b/sound/adlib.cpp @@ -21,7 +21,6 @@ #include "stdafx.h" #include "scumm.h" -#include "sound.h" #include "fmopl.h" #if defined USE_ADLIB diff --git a/sound/gmidi.cpp b/sound/gmidi.cpp index 957a999e52..92246a4f26 100644 --- a/sound/gmidi.cpp +++ b/sound/gmidi.cpp @@ -33,7 +33,6 @@ #include "stdafx.h" #include "scumm.h" -#include "sound.h" #include "gmidi.h" void MidiSoundDriver::midiSetDriver(int devicetype) { diff --git a/sound/gmidi.h b/sound/gmidi.h index 85ec70bfba..a991451f8b 100644 --- a/sound/gmidi.h +++ b/sound/gmidi.h @@ -2,11 +2,34 @@ #define gmidi_h /* General Midi header file */ - -#define SEQ_MIDIPUTC 5 /* For timidity */ +#define SEQ_MIDIPUTC 5 #define SPECIAL_CHANNEL 9 #define DEVICE_NUM 0 +/* Sound output type - MIDI */ +enum { + MIDI_NULL = 0, + MIDI_WINDOWS = 1, + MIDI_TIMIDITY = 2, + MIDI_SEQ = 3, + MIDI_QTMUSIC = 4, + MIDI_AMIDI = 5 +}; + +/* Roland to General Midi patch table. Still needs much work. */ +static const byte mt32_to_gmidi[128] = { + 0, 1, 2, 4, 4, 5, 5, 3, 16, 17, 18, 18, 19, + 19, 20, 21, 6, 6, 6, 7, 7, 7, 8, 8, 62, 63, + 62, 63, 38, 39, 38, 39, 88, 89, 52, 113, 97, 96, 91, + 85, 14, 101, 68, 95, 86, 103, 88, 80, 48, 49, 51, 45, + 40, 40, 42, 42, 43, 46, 46, 24, 25, 26, 27, 104, 32, + 33, 34, 39, 36, 37, 38, 35, 79, 73, 72, 72, 74, 75, + 64, 65, 66, 67, 71, 71, 68, 69, 70, 22, 56, 59, 57, + 63, 60, 60, 58, 61, 61, 11, 11, 12, 88, 9, 14, 13, + 12, 107, 111, 77, 78, 78, 76, 121, 47, 117, 127, 115, 118, + 116, 118, 94, 115, 9, 55, 124, 123, 125, 126, 127 +}; + #ifdef __APPLE__CW #include <QuickTimeComponents.h> #include "QuickTimeMusic.h" @@ -41,20 +64,4 @@ extern struct IOMidiRequest *ScummMidiRequest; #endif - -/* Roland to General Midi patch table. Still needs much work. */ -static const byte mt32_to_gmidi[128] = { - 0, 1, 2, 4, 4, 5, 5, 3, 16, 17, 18, 18, 19, - 19, 20, 21, 6, 6, 6, 7, 7, 7, 8, 8, 62, 63, - 62, 63, 38, 39, 38, 39, 88, 89, 52, 113, 97, 96, 91, - 85, 14, 101, 68, 95, 86, 103, 88, 80, 48, 49, 51, 45, - 40, 40, 42, 42, 43, 46, 46, 24, 25, 26, 27, 104, 32, - 33, 34, 39, 36, 37, 38, 35, 79, 73, 72, 72, 74, 75, - 64, 65, 66, 67, 71, 71, 68, 69, 70, 22, 56, 59, 57, - 63, 60, 60, 58, 61, 61, 11, 11, 12, 88, 9, 14, 13, - 12, 107, 111, 77, 78, 78, 76, 121, 47, 117, 127, 115, 118, - 116, 118, 94, 115, 9, 55, 124, 123, 125, 126, 127 -}; - - #endif /* defined(gmidi_h) */ diff --git a/sound/imuse.cpp b/sound/imuse.cpp index f62afb984c..ce2bb84669 100644 --- a/sound/imuse.cpp +++ b/sound/imuse.cpp @@ -22,7 +22,6 @@ #include "stdafx.h" #include "scumm.h" -#include "sound.h" int num_mix; |