Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 0bfe37ee826581ccab7815b50afd71930725740f..f765a3193772b021c0bcda98209810b2f676753e 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -36,12 +36,13 @@ Performance::~Performance ()
 void
 Performance::output (Midi_stream &midi_stream)
 {
-  int tracks_ = audio_staffs_.size ();
+  int tracks_i = audio_staffs_.size () + 1;
 
   // ugh
-  int clocks_per_4 = 384;
+  int clocks_per_4_i = 384;
 
-  midi_stream << Midi_header (1, tracks_, clocks_per_4);
+  midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
+  output_header_track (midi_stream);
   message (_ ("Track...") + " ");
   int channel = 0;
   for (vsize i = 0; i < audio_staffs_.size (); i++)
@@ -61,22 +62,88 @@ Performance::output (Midi_stream &midi_stream)
        Huh? Why does each staff also have a separate channel? We
        should map channels to voices, not staves. --hwn.
       */
-      if (channel > 15)
+      if (s->channel_ < 0)
        {
-         warning (_ ("MIDI channel wrapped around"));
-         warning (_ ("remapping modulo 16"));
+         s->channel_ = channel % 16;
+         if (channel > 15)
+           {
+             warning (_ ("MIDI channel wrapped around"));
+             warning (_ ("remapping modulo 16"));
+           }
        }
 
-      s->output (midi_stream, channel);
-      channel ++;
+      s->output (midi_stream, channel++);
       if (be_verbose_global)
        progress_indication ("]");
     }
 }
 
+void
+Performance::output_header_track (Midi_stream &midi_stream)
+{
+  Midi_track midi_track;
+
+  midi_track.channel_ = 9;
+
+  // perhaps multiple text events?
+  string id_string;
+  string str = string (_ ("Creator: "));
+  id_string = String_convert::pad_to (gnu_lilypond_version_string (), 30);
+  str += id_string;
+
+  /*
+    This seems silly, but in fact the audio elements should
+    be generated elsewhere: not midi-specific.
+  */
+  Audio_text creator_a (Audio_text::TEXT, str);
+  Midi_text creator (&creator_a);
+  midi_track.add (Moment (0), &creator);
+
+  /* Better not translate this */
+  str = "Generated automatically by: ";
+  str += id_string;
+
+  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.substr (0, str.length () - 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);
+
+  // TODO:
+  //  str = _f ("from musical definition: %s", origin_string_);
+
+  Audio_text from_a (Audio_text::TEXT, str);
+  Midi_text from (&from_a);
+  midi_track.add (Moment (0), &from);
+
+  Audio_text track_name_a (Audio_text::TRACK_NAME, "Track "
+                          + String_convert::int2dec (0, 0, '0'));
+  Midi_text track_name (&track_name_a);
+
+  midi_track.add (Moment (0), &track_name);
+
+  // Some sequencers read track 0 last.
+  //  Audio_tempo tempo_a (midi_->get_tempo (Moment (Rational (1, 4))));
+  //  Midi_tempo tempo (&tempo_a);
+  //  midi_track.add (Moment (0), &tempo);
+
+  midi_stream << midi_track;
+}
+
 void
 Performance::add_element (Audio_element *p)
 {
+  if (Audio_staff *s = dynamic_cast<Audio_staff *> (p))
+    audio_staffs_.push_back (s);
+
   audio_elements_.push_back (p);
 }
 
@@ -98,4 +165,3 @@ Performance::write_output (string out)
   progress_indication ("\n");
 }
 
-