release: 1.5.29

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index d2d214ab998108ceaeab2b25f5377b65485f91cc..9e1b7058c307679407cfec0948e791234f36a1c5 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <time.h>
@@ -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];
@@ -57,32 +57,32 @@ Performance::output (Midi_stream& midi_stream)
        progress_indication ("[" + to_str (i)) ;
 
       /*
-       Aargh, let's hear it for the MIDI standard.
        MIDI players tend to ignore instrument settings on
        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 ("]");
     }
 }
 
+
 void
 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: "));
-  if (no_timestamps_global_b)
-    id_str = gnu_lilypond_str ();
-  else
-    id_str = gnu_lilypond_version_str ();
+  id_str = String_convert::pad_to (gnu_lilypond_version_str (), 30);
   str += id_str;
-  str += "\n";
 
   /*
     This seems silly, but in fact the audio elements should
@@ -95,24 +95,22 @@ Performance::output_header_track (Midi_stream& midi_stream)
   /* Better not translate this */
   str = "Generated automatically by: ";
   str += id_str;
-  if (no_timestamps_global_b)
-    str += ".\n";
-  else
-    {
-      str += _ (", at ");
-      time_t t (time (0));
-      str += ctime (&t);
-      str = str.left_str (str.length_i () - 1);
-    }
-
-  /*
-    Pad out time stamps to 120 chars.  */
-  str = str + to_str (' ' , (120 - str.length_i ()) >? 0);
   
   Audio_text generate_a (Audio_text::TEXT, str);
   Midi_text generate (&generate_a);
   midi_track.add (Moment (0), &generate);
+  
+  str = _ ("at ");
+  time_t t (time (0));
+  str += ctime (&t);
+  str = str.left_str (str.length_i () - 1);
+  str = String_convert::pad_to (str, 60);
+  
+  Audio_text at_a (Audio_text::TEXT, str);
+  Midi_text at (&at_a);
+  midi_track.add (Moment (0), &at);
 
+  
   str = _f ("from musical definition: %s", origin_str_);
 
   Audio_text from_a (Audio_text::TEXT, str);
@@ -126,7 +124,7 @@ Performance::output_header_track (Midi_stream& midi_stream)
   midi_track.add (Moment (0), &track_name);
 
   // Some sequencers read track 0 last.
-  //  Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (1, 4)));
+  //  Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (Rational (1, 4))));
   //  Midi_tempo tempo (&tempo_a);
   //  midi_track.add (Moment (0), &tempo);
 
@@ -168,7 +166,7 @@ Performance::process ()
   out = p.str ();
   
   Midi_stream midi_stream (out);
-  progress_indication (_f ("MIDI output to %s...", out));
+  progress_indication (_f ("MIDI output to `%s'...", out));
   target_str_global_array.push (out);
 
   output (midi_stream);