* Documentation/topdocs/NEWS.tely (Top): doc new feature.

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 99aa0458de82ee744e7d665db24e0fb55ccd3936..f765a3193772b021c0bcda98209810b2f676753e 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,118 +3,135 @@
 
   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 "international.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-item.hh"
-#include "audio-staff.hh"
-#include "performance.hh"

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

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

 
 Performance::Performance ()
 {
 
 Performance::Performance ()
 {

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

 }
 
 }
 

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

 {
 {

-  delete audio_elem_p_list_;
+  junk_pointers (audio_elements_);

 }
 
 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);

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

     {
     {

-      Audio_staff *s = audio_staff_l_arr_[i];
-      progress_indication ("[" + to_str (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++);

-      progress_indication ("]");
+      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";
+  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.
 
   /*
     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);
 
   Audio_text creator_a (Audio_text::TEXT, str);
   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_string;
+

   Audio_text generate_a (Audio_text::TEXT, str);
   Midi_text generate (&generate_a);
   midi_track.add (Moment (0), &generate);
 
   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_);
+  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 "
 
   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::i2dec_str (0, 0, '0'));
+                          + String_convert::int2dec (0, 0, '0'));

   Midi_text track_name (&track_name_a);
   Midi_text track_name (&track_name_a);

-                       
+

   midi_track.add (Moment (0), &track_name);
 
   // Some sequencers read track 0 last.
   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_->get_tempo (Moment (Rational (1, 4))));

   //  Midi_tempo tempo (&tempo_a);
   //  midi_track.add (Moment (0), &tempo);
 
   //  Midi_tempo tempo (&tempo_a);
   //  midi_track.add (Moment (0), &tempo);
 


@@ -124,54 +141,27 @@ 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_back (s);

 
 

-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
+  audio_elements_.push_back (p);

 }
 
 void
 }
 
 void

-Performance::process()
+Performance::write_output (string out)

 {
 {

-  print ();
+  if (out == "-")
+    out = "lelie.midi";

 
 

-  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);
-       }
+  /* Maybe a bit crude, but we had this before */
+  File_name file_name (out);
+  file_name.ext_ = "midi";
+  out = file_name.to_string ();

 
 

-      out += ".midi";
-    }
-  

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

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

 
   output (midi_stream);
 
   output (midi_stream);

-  progress_indication("\n");
+  progress_indication ("\n");

 }
 }

+