summaryrefslogtreecommitdiff
path: root/src/midifile.h
diff options
context:
space:
mode:
authorSimon Howard2009-04-03 19:58:08 +0000
committerSimon Howard2009-04-03 19:58:08 +0000
commit9b192c44f932542ccd835936d593c43ce3e9e9e3 (patch)
treec2135f4fcd61dd87ab9b3d710e65a44df2b69a0d /src/midifile.h
parentc4f640be999e80351f1c89c893a0d5ce39c20cd9 (diff)
downloadchocolate-doom-9b192c44f932542ccd835936d593c43ce3e9e9e3.tar.gz
chocolate-doom-9b192c44f932542ccd835936d593c43ce3e9e9e3.tar.bz2
chocolate-doom-9b192c44f932542ccd835936d593c43ce3e9e9e3.zip
Fix up MIDI reading code; add test code.
Subversion-branch: /branches/opl-branch Subversion-revision: 1494
Diffstat (limited to 'src/midifile.h')
-rw-r--r--src/midifile.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/midifile.h b/src/midifile.h
index d7df8b86..7928fdda 100644
--- a/src/midifile.h
+++ b/src/midifile.h
@@ -65,13 +65,14 @@ typedef enum
MIDI_META_MARKER = 0x6,
MIDI_META_CUE_POINT = 0x7,
- MIDI_META_CHANNEL_PREFIX = 0x8,
- MIDI_META_END_OF_TRACK = 0x9,
- MIDI_META_SET_TEMPO = 0xa,
- MIDI_META_SMPTE_OFFSET = 0xb,
- MIDI_META_TIME_SIGNATURE = 0xc,
- MIDI_META_KEY_SIGNATURE = 0xd,
- MIDI_META_SEQUENCER_SPECIFIC = 0xe,
+ MIDI_META_CHANNEL_PREFIX = 0x20,
+ MIDI_META_END_OF_TRACK = 0x2f,
+
+ MIDI_META_SET_TEMPO = 0x51,
+ MIDI_META_SMPTE_OFFSET = 0x54,
+ MIDI_META_TIME_SIGNATURE = 0x58,
+ MIDI_META_KEY_SIGNATURE = 0x59,
+ MIDI_META_SEQUENCER_SPECIFIC = 0x7f,
} midi_meta_event_type_t;
typedef struct