Merge remote branch 'origin' into release/unstable

[lilypond.git] / lily / midi-chunk.cc

diff --git a/lily/midi-chunk.cc b/lily/midi-chunk.cc
index 01a4b9c5a4897e998ed89be040b1f38804f49138..0aa11eb5497bc388f83b7e323217d46ab9705cbb 100644 (file)
--- a/lily/midi-chunk.cc
+++ b/lily/midi-chunk.cc
@@ -24,7 +24,8 @@
 #include "std-string.hh"
 #include "string-convert.hh"
 
-Midi_track::Midi_track ()
+Midi_track::Midi_track (int number, bool port)
+ : number_ (number)
 {
   //                4D 54 72 6B     MTrk
   //                00 00 00 3B     chunk length (59)
@@ -40,8 +41,6 @@ Midi_track::Midi_track ()
   //         mi = 0:  major key
   //         mi = 1:  minor key
 
-  number_ = 0;
-
   char const *data_str0 = ""
     //        "00" "ff58" "0404" "0218" "08"
     // "00" "ff51" "0307" "a120"
@@ -56,6 +55,13 @@ Midi_track::Midi_track ()
   // only for format 0 (currently using format 1)?
   data_string += String_convert::hex2bin (data_str0);
 
+  if (port)
+    {
+      string port = "00" "ff" "21" "01"
+       + String_convert::int2hex (number_, 2, '0');
+      data_string += String_convert::hex2bin (port);
+    }
+
   char const *footer_str0 = "00" "ff2f" "00";
   string footer_string = String_convert::hex2bin (footer_str0);
 
@@ -104,7 +110,6 @@ Midi_event::to_string () const
 {
   string delta_string = int2midi_varint_string (delta_ticks_);
   string midi_string = midi_->to_string ();
-  assert (midi_string.length ());
   return delta_string + midi_string;
 }
 /****************************************************************