release: 1.3.144

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 436224bde8ae3c95417bb64f6d8f3dfa48f11df4..be168b2de052d6ff57c7a35a3d5363a431c93f46 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -49,7 +49,7 @@ Performance::output (Midi_stream& midi_stream)
   output_header_track (midi_stream);
   progress_indication ("\n");
   progress_indication (_ ("Track ... "));
-  int channel = 1;
+  int channel = 0;
   for (int i =0; i < audio_staff_l_arr_.size (); i++)
     {
       Audio_staff *s = audio_staff_l_arr_[i];
@@ -62,7 +62,9 @@ Performance::output (Midi_stream& midi_stream)
        channel 10, the percussion channel by default.
        */
       if (channel == 9)
-       channel++;
+        channel++;
+      if (s->channel_i_ < 0)
+        s->channel_i_ = channel;
       s->output (midi_stream, channel++);
       if (verbose_global_b)
        progress_indication ("]");
@@ -74,6 +76,8 @@ Performance::output_header_track (Midi_stream& midi_stream)
 {
   Midi_track midi_track;
 
+  midi_track.channel_i_ = 9;
+
   // perhaps multiple text events?
   String id_str;
   String str = String (_ ("Creator: "));