Merge pull request #412 from ChurchOrganist/MIDI-meta-event-change

Fix for Issue #21852
musescore · Jul 17, 2013 · 7e8e83b · 7e8e83b
2 parents f21a599 + 4e9110c
commit 7e8e83b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git 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
@@ -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