* The grand 2005-2006 replace.

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index f25b63eea11c5d25175cb7bb27007667938f3202..a70f7aff993cbc1c3337770bbfffc52bf9bbb156 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,104 +3,139 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 */
 

-#include <time.h>
-#include "debug.hh"
-#include "string.hh"
-#include "string-convert.hh"
+#include "performance.hh"
+
+#include <ctime>
+using namespace std;
+
+#include "audio-column.hh"
+#include "audio-staff.hh"
+#include "file-name.hh"
+#include "lily-version.hh"

 #include "main.hh"
 #include "main.hh"

-#include "midi-def.hh"

 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"

-#include "audio-column.hh"
-#include "audio-staff.hh"
-#include "performance.hh"

 #include "score.hh"
 #include "score.hh"

-#include "file-results.hh"
-#include "lily-version.hh"
+#include "string-convert.hh"
+#include "warn.hh"

 
 #include "killing-cons.tcc"
 
 Performance::Performance ()
 {
 
 #include "killing-cons.tcc"
 
 Performance::Performance ()
 {

-  midi_l_ =0;
-  audio_elem_p_list_ = 0;
+  midi_ = 0;
+  audio_element_list_ = 0;

 }
 
 }
 

-
-Performance::~Performance()
+Performance::~Performance ()

 {
 {

-  delete audio_elem_p_list_;
+  delete audio_element_list_;

 }
 
 void
 }
 
 void

-Performance::output (Midi_stream& midi_stream)
+Performance::output (Midi_stream &midi_stream)

 {
 {

-  int tracks_i = audio_staff_l_arr_.size() + 1;
+  int tracks_i = audio_staffs_.size () + 1;

 
   // ugh
   int clocks_per_4_i = 384;
 
   midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
   output_header_track (midi_stream);
 
   // ugh
   int clocks_per_4_i = 384;
 
   midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
   output_header_track (midi_stream);

-  int channel = 1;
-  for (int i =0; i < audio_staff_l_arr_.size (); i++)
+  message (_ ("Track...") + " ");
+  int channel = 0;
+  for (int i = 0; i < audio_staffs_.size (); i++)

     {
     {

-      Audio_staff *s = audio_staff_l_arr_[i];
+      Audio_staff *s = audio_staffs_[i];
+      if (be_verbose_global)
+       progress_indication ("[" + to_string (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.
        MIDI players tend to ignore instrument settings on
        channel 10, the percussion channel by default.

-       */
-      if (channel == 9)
+      */
+      if (channel % 16 == 9)

        channel++;
        channel++;

+
+      /*
+       Huh? Why does each staff also have a separate channel? We
+       should map channels to voices, not staves. --hwn.
+      */
+      if (s->channel_ < 0)
+       {
+         s->channel_ = channel % 16;
+         if (channel > 15)
+           {
+             warning (_ ("MIDI channel wrapped around"));
+             warning (_ ("remapping modulo 16"));
+           }
+       }
+

       s->output (midi_stream, channel++);
       s->output (midi_stream, channel++);

+      if (be_verbose_global)
+       progress_indication ("]");

     }
 }
 
 void
     }
 }
 
 void

-Performance::output_header_track (Midi_stream& midi_stream)
+Performance::output_header_track (Midi_stream &midi_stream)

 {
   Midi_track midi_track;
 
 {
   Midi_track midi_track;
 

+  midi_track.channel_ = 9;
+

   // perhaps multiple text events?
   // 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";
-
-  Midi_text creator (Midi_text::TEXT, str);
+  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);
 
   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);
-    }
-  Midi_text generate (Midi_text::TEXT, str);
+  /* 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);
 
   midi_track.add (Moment (0), &generate);
 

-  str = _f ("from musical definition: %s", origin_str_);
+  str = _ ("at ");
+  time_t t (time (0));
+  str += ctime (&t);
+  str = str.left_string (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_);

 
 

-  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_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::int2dec (0, 0, '0'));
+  Midi_text track_name (&track_name_a);
+

   midi_track.add (Moment (0), &track_name);
 
   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_->get_tempo (Moment (Rational (1, 4))));
+  //  Midi_tempo tempo (&tempo_a);
+  //  midi_track.add (Moment (0), &tempo);

 
   midi_stream << midi_track;
 }
 
   midi_stream << midi_track;
 }


@@ -108,54 +143,26 @@ Performance::output_header_track (Midi_stream& midi_stream)
 void
 Performance::add_element (Audio_element *p)
 {
 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_);
+  if (Audio_staff *s = dynamic_cast<Audio_staff *> (p))
+    audio_staffs_.push (s);
+  audio_element_list_ = new Killing_cons<Audio_element> (p, audio_element_list_);

 }
 
 void
 }
 
 void

-Performance::print() const
+Performance::write_output (String out)

 {
 {

-#ifndef NPRINT
-  DOUT << "Performance { ";
-  DOUT << "Items: ";
-  for (Cons<Audio_element>* i =audio_elem_p_list_; i; i = i->next_)
-    i->car_->print ();
-  DOUT << "}";
-#endif
-}
+  if (out == "-")
+    out = "lelie.midi";

 
 

-void
-Performance::process()
-{
-  print ();
+  /* Maybe a bit crude, but we had this before */
+  File_name file_name (out);
+  file_name.ext_ = "midi";
+  out = file_name.to_string ();

 
 

-  String out = midi_l_->get_default_output ();
-  if (out.empty_b ())
-    {
-      
-      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";
-    }
-  

   Midi_stream midi_stream (out);
   Midi_stream midi_stream (out);

-  *mlog << _f ("MIDI output to %s...", out) << endl;
-  target_str_global_array.push (out);
+  message (_f ("MIDI output to `%s'...", out));

 
   output (midi_stream);
 
   output (midi_stream);

-  *mlog << endl;
+  progress_indication ("\n");

 }
 }

+