Emit not-quite-cross-staff beams in the right context.

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

diff --git a/lily/midi-chunk.cc b/lily/midi-chunk.cc
index aaed0a27feae45056a4d956880018029947cdcd4..0aa11eb5497bc388f83b7e323217d46ab9705cbb 100644 (file)
--- a/lily/midi-chunk.cc
+++ b/lily/midi-chunk.cc
@@ -24,7 +24,7 @@
 #include "std-string.hh"
 #include "string-convert.hh"
 
-Midi_track::Midi_track (int number)
+Midi_track::Midi_track (int number, bool port)
  : number_ (number)
 {
   //                4D 54 72 6B     MTrk
@@ -55,8 +55,12 @@ Midi_track::Midi_track (int number)
   // only for format 0 (currently using format 1)?
   data_string += String_convert::hex2bin (data_str0);
 
-  string port = "00" "ff" "21" "01" + String_convert::int2hex (number_, 2, '0');
-  data_string += String_convert::hex2bin (port);
+  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);
@@ -106,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;
 }
 /****************************************************************