Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 985901c01cac1466af0dbfde49288548b131f614..0bfe37ee826581ccab7815b50afd71930725740f 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performance.hh"
@@ -14,6 +14,7 @@ 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 "midi-item.hh"
@@ -22,32 +23,28 @@ using namespace std;
 #include "string-convert.hh"
 #include "warn.hh"
 
-#include "killing-cons.tcc"
-
 Performance::Performance ()
 {
   midi_ = 0;
-  audio_element_list_ = 0;
 }
 
 Performance::~Performance ()
 {
-  delete audio_element_list_;
+  junk_pointers (audio_elements_);
 }
 
 void
 Performance::output (Midi_stream &midi_stream)
 {
-  int tracks_i = audio_staffs_.size () + 1;
+  int tracks_ = audio_staffs_.size ();
 
   // ugh
-  int clocks_per_4_i = 384;
+  int clocks_per_4 = 384;
 
-  midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
-  output_header_track (midi_stream);
+  midi_stream << Midi_header (1, tracks_, clocks_per_4);
   message (_ ("Track...") + " ");
   int channel = 0;
-  for (int i = 0; i < audio_staffs_.size (); i++)
+  for (vsize i = 0; i < audio_staffs_.size (); i++)
     {
       Audio_staff *s = audio_staffs_[i];
       if (be_verbose_global)
@@ -64,92 +61,27 @@ 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 (s->channel_ < 0)
+      if (channel > 15)
        {
-         s->channel_ = channel % 16;
-         if (channel > 15)
-           {
-             warning (_ ("MIDI channel wrapped around"));
-             warning (_ ("remapping modulo 16"));
-           }
+         warning (_ ("MIDI channel wrapped around"));
+         warning (_ ("remapping modulo 16"));
        }
 
-      s->output (midi_stream, channel++);
+      s->output (midi_stream, channel);
+      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.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_);
-
-  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 (s);
-  audio_element_list_ = new Killing_cons<Audio_element> (p, audio_element_list_);
+  audio_elements_.push_back (p);
 }
 
 void
-Performance::write_output (String out)
+Performance::write_output (string out)
 {
   if (out == "-")
     out = "lelie.midi";
@@ -166,3 +98,4 @@ Performance::write_output (String out)
   progress_indication ("\n");
 }
 
+