patch::: 1.3.130.jcn2

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index e10a51c229e258d3595f534ce9518b0cee214463..53d223c7d20dfdb51d0da3a0ac0972eefceec4ec 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <time.h>
@@ -15,10 +15,12 @@
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "audio-column.hh"
+#include "audio-item.hh"
 #include "audio-staff.hh"
 #include "performance.hh"
 #include "score.hh"
 #include "file-results.hh"
+#include "file-path.hh"
 #include "lily-version.hh"
 
 #include "killing-cons.tcc"
@@ -29,12 +31,6 @@ Performance::Performance ()
   audio_elem_p_list_ = 0;
 }
 
-void
-Performance::add_column (Audio_column* p)
-{
-  p->performance_l_ = this;
-  add_element (p);
-}
 
 Performance::~Performance()
 {
@@ -51,18 +47,25 @@ Performance::output (Midi_stream& midi_stream)
 
   midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
   output_header_track (midi_stream);
-  int n = 1;
+  progress_indication ("\n");
+  progress_indication (_ ("Track ... "));
+  int channel = 1;
   for (int i =0; i < audio_staff_l_arr_.size (); i++)
     {
       Audio_staff *s = audio_staff_l_arr_[i];
+      if(verbose_global_b)
+       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 (n == 10)
-       n++;
-      s->output (midi_stream, n++);
+      if (channel == 9)
+       channel++;
+      s->output (midi_stream, channel++);
+      if(verbose_global_b)
+       progress_indication ("]");
     }
 }
 
@@ -72,17 +75,25 @@ Performance::output_header_track (Midi_stream& midi_stream)
   Midi_track midi_track;
 
   // perhaps multiple text events?
+  String id_str;
   String str = String (_("Creator: "));
   if (no_timestamps_global_b)
-    str += gnu_lilypond_str ();
+    id_str = gnu_lilypond_str ();
   else
-    str += gnu_lilypond_version_str();
+    id_str = gnu_lilypond_version_str();
+  str += id_str;
   str += "\n";
 
-  Midi_text creator (Midi_text::TEXT, str);
+  /*
+    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);
 
-  str = _("Automatically generated");
+  str = _("Generated automatically by: ");
+  str += id_str;
   if (no_timestamps_global_b)
     str += ".\n";
   else
@@ -92,73 +103,63 @@ Performance::output_header_track (Midi_stream& midi_stream)
       str += ctime (&t);
       str = str.left_str (str.length_i() - 1);
     }
-  Midi_text generate (Midi_text::TEXT, str);
+  Audio_text generate_a (Audio_text::TEXT, str);
+  Midi_text generate (&generate_a);
   midi_track.add (Moment (0), &generate);
 
   str = _f ("from musical definition: %s", origin_str_);
 
-  Midi_text from (Midi_text::TEXT, str);
+  Audio_text from_a (Audio_text::TEXT, str);
+  Midi_text from (&from_a);
   midi_track.add (Moment (0), &from);
 
-  Midi_text track_name (Midi_text::TRACK_NAME, "Track "
-                       + String_convert::i2dec_str (0, 0, '0'));
+  Audio_text track_name_a (Audio_text::TRACK_NAME, "Track "
+                          + String_convert::i2dec_str (0, 0, '0'));
+  Midi_text track_name (&track_name_a);
+                       
   midi_track.add (Moment (0), &track_name);
 
-  Midi_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4)));
-  midi_track.add (Moment (0), &tempo);
+  // Some sequencers read track 0 last.
+  //  Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (1, 4)));
+  //  Midi_tempo tempo (&tempo_a);
+  //  midi_track.add (Moment (0), &tempo);
 
   midi_stream << midi_track;
 }
 
-void
-Performance::add_staff (Audio_staff* l)
-{
-  audio_staff_l_arr_.push (l);
-}
-
 void
 Performance::add_element (Audio_element *p)
 {
+  if (Audio_staff*s=dynamic_cast<Audio_staff *> (p)) 
+    {
+      audio_staff_l_arr_.push (s);
+    }
+  else if (Audio_column *c = dynamic_cast<Audio_column*>(p))
+    {
+      c->performance_l_ = this;
+    }
   audio_elem_p_list_ = new Killing_cons<Audio_element> (p, audio_elem_p_list_);
 }
 
-void
-Performance::print() const
-{
-#ifndef NPRINT
-  DOUT << "Performance { ";
-  DOUT << "Items: ";
-  for (Cons<Audio_element>* i =audio_elem_p_list_; i; i = i->next_)
-    i->car_->print ();
-  DOUT << "}";
-#endif
-}
 
 void
 Performance::process()
 {
-  print ();
-
-  String out = midi_l_->get_default_output ();
-  if (out.empty_b ())
+  String out = outname_global;
+  if (out == "-")
+    out = "lelie.midi";
+  int def = midi_l_->get_next_default_count ();
+  if (def)
     {
-      
-      out = default_outname_base_global;
-      if (out == "-")
-        out = "lelie";
-      int def = midi_l_->get_next_default_count ();
-      if (def)
-       {
-         out += "-" + to_str (def);
-       }
-
-      out += ".midi";
+      Path p = split_path (out);
+      p.base += "-" + to_str (def);
+      out = p.path ();
     }
   
   Midi_stream midi_stream (out);
-  *mlog << _f ("MIDI output to %s...", out) << endl;
+  progress_indication ( _f ("MIDI output to %s...", out));
   target_str_global_array.push (out);
 
   output (midi_stream);
-  *mlog << endl;
+  progress_indication("\n");
 }