From 4e9110cd453ac94eee3dcb05261b2677c748d179 Mon Sep 17 00:00:00 2001 From: Michael Cowgill Date: Wed, 17 Jul 2013 10:58:27 +0100 Subject: [PATCH] Fix for Issue #21852 MuseScore MIDI meta-events are conflicting with MMA definitions: See http://musescore.org/en/node/21852 for full details. --- miditools/midievent.h | 14 ++++++++------ synthesizer/event.h | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/miditools/midievent.h b/miditools/midievent.h index 9c2dc46048a8..a8fa22570824 100644 --- a/miditools/midievent.h +++ b/miditools/midievent.h @@ -87,12 +87,14 @@ enum { META_LYRIC = 5, META_MARKER = 6, META_CUE_POINT = 7, - META_TITLE = 8, // mscore extension - META_SUBTITLE = 9, // mscore extension - META_COMPOSER = 0xa, // mscore extension - META_TRANSLATOR = 0xb, // mscore extension - META_POET = 0xc, // mscore extension - META_TRACK_COMMENT = 0xf, + META_PROGRAM_NAME = 8, // MIDI Meta Events 8 and 9 were defined as above by the MMA in 1998 + META_DEVICE_NAME = 9, // It is therefore necessary to redefine MuseScore's private meta events + META_TRACK_COMMENT = 0xf, // Using the block starting 0x10 seems sensible as that is currently clear + META_TITLE = 0x10, // mscore extension + META_SUBTITLE = 0x11, // mscore extension + META_COMPOSER = 0x12, // mscore extension + META_TRANSLATOR = 0x13, // mscore extension + META_POET = 0x14, // mscore extension META_PORT_CHANGE = 0x21, META_CHANNEL_PREFIX = 0x22, META_EOT = 0x2f, // end of track diff --git a/synthesizer/event.h b/synthesizer/event.h index 2341331a01a9..f18aa5f34b63 100644 --- a/synthesizer/event.h +++ b/synthesizer/event.h @@ -62,12 +62,14 @@ enum { META_LYRIC = 5, META_MARKER = 6, META_CUE_POINT = 7, - META_TITLE = 8, // mscore extension - META_SUBTITLE = 9, // mscore extension - META_COMPOSER = 0xa, // mscore extension - META_TRANSLATOR = 0xb, // mscore extension - META_POET = 0xc, // mscore extension - META_TRACK_COMMENT = 0xf, + META_PROGRAM_NAME = 8, // MIDI Meta Events 8 and 9 were defined as above by the MMA in 1998 + META_DEVICE_NAME = 9, // It is therefore necessary to redefine MuseScore's private meta events + META_TRACK_COMMENT = 0xf, // Using the block starting 0x10 seems sensible as that is currently clear + META_TITLE = 0x10, // mscore extension + META_SUBTITLE = 0x11, // mscore extension + META_COMPOSER = 0x12, // mscore extension + META_TRANSLATOR = 0x13, // mscore extension + META_POET = 0x14, // mscore extension META_PORT_CHANGE = 0x21, META_CHANNEL_PREFIX = 0x22, META_EOT = 0x2f, // end of track