X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=9e1b7058c307679407cfec0948e791234f36a1c5;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=84a8e64b4c5b9f1a92f5b0392abbef062d0ceda8;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index 84a8e64b4c..9e1b7058c3 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <time.h>
@@ -20,6 +20,7 @@
 #include "performance.hh"
 #include "score.hh"
 #include "file-results.hh"
+#include "file-path.hh"
 #include "lily-version.hh"
 
 #include "killing-cons.tcc"
@@ -31,7 +32,7 @@ Performance::Performance ()
 }
 
 
-Performance::~Performance()
+Performance::~Performance ()
 {
   delete audio_elem_p_list_;
 }
@@ -39,7 +40,7 @@ Performance::~Performance()
 void
 Performance::output (Midi_stream& midi_stream)
 {
-  int tracks_i = audio_staff_l_arr_.size() + 1;
+  int tracks_i = audio_staff_l_arr_.size () + 1;
 
   // ugh
   int clocks_per_4_i = 384;
@@ -48,36 +49,40 @@ 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];
-      progress_indication ("[" + to_str (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 (channel == 9)
-	channel++;
+	 channel++;
+      if (s->channel_i_ < 0)
+	 s->channel_i_ = channel;
       s->output (midi_stream, channel++);
-      progress_indication ("]");
+      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 str = String (_("Creator: "));
-  if (no_timestamps_global_b)
-    str += gnu_lilypond_str ();
-  else
-    str += gnu_lilypond_version_str();
-  str += "\n";
+  String id_str;
+  String str = String (_ ("Creator: "));
+  id_str = String_convert::pad_to (gnu_lilypond_version_str (), 30);
+  str += id_str;
 
   /*
     This seems silly, but in fact the audio elements should
@@ -87,20 +92,25 @@ Performance::output_header_track (Midi_stream& midi_stream)
   Midi_text creator (&creator_a);
   midi_track.add (Moment (0), &creator);
 
-  str = _("Automatically generated");
-  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);
-    }
+  /* Better not translate this */
+  str = "Generated automatically by: ";
+  str += id_str;
+  
   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);
@@ -114,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);
 
@@ -128,50 +138,37 @@ Performance::add_element (Audio_element *p)
     {
       audio_staff_l_arr_.push (s);
     }
-  else if (Audio_column *c = dynamic_cast<Audio_column*>(p))
+  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
-  DEBUG_OUT << "Performance { ";
-  DEBUG_OUT << "Items: ";
-  for (Cons<Audio_element>* i =audio_elem_p_list_; i; i = i->next_)
-    i->car_->print ();
-  DEBUG_OUT << "}";
-#endif
-}
 
 void
-Performance::process()
+Performance::process ()
 {
-  print ();
-
-  String out = midi_l_->get_default_output ();
-  if (out.empty_b ())
+  String out = output_name_global;
+  if (out == "-")
+    out = "lelie.midi";
+  int def = midi_l_->get_next_score_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.str ();
     }
+
+  /* Maybe a bit crude, but we had this before */
+  Path p = split_path (out);
+  p.ext = "midi";
+  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);
-  progress_indication("\n");
+  progress_indication ("\n");
 }