X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=439d9489f175727bc3ad0624179acaa49b8145d2;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=e10a51c229e258d3595f534ce9518b0cee214463;hpb=73be5f6fe264e90a56e45f2d70129b133731188b;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index e10a51c229..439d9489f1 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,162 +3,109 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 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 "midi-def.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "audio-column.hh"
-#include "audio-staff.hh"
-#include "performance.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 ()
 {
-  midi_l_ =0;
-  audio_elem_p_list_ = 0;
+  midi_ = 0;
 }
 
-void
-Performance::add_column (Audio_column* p)
-{
-  p->performance_l_ = this;
-  add_element (p);
-}
-
-Performance::~Performance()
+Performance::~Performance ()
 {
-  delete audio_elem_p_list_;
+  junk_pointers (audio_elements_);
 }
 
 void
-Performance::output (Midi_stream& midi_stream)
+Performance::output (Midi_stream &midi_stream) const
 {
-  int tracks_i = audio_staff_l_arr_.size() + 1;
+  int tracks_ = audio_staffs_.size ();
 
-  // ugh
-  int clocks_per_4_i = 384;
-
-  midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
-  output_header_track (midi_stream);
-  int n = 1;
-  for (int i =0; i < audio_staff_l_arr_.size (); i++)
-    {
-      Audio_staff *s = audio_staff_l_arr_[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++);
-    }
-}
-
-void
-Performance::output_header_track (Midi_stream& midi_stream)
-{
-  Midi_track midi_track;
-
-  // 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);
-  midi_track.add (Moment (0), &creator);
-
-  str = _("Automatically generated");
-  if (no_timestamps_global_b)
-    str += ".\n";
-  else
+  midi_stream.write (Midi_header (1, tracks_, 384));
+  if (be_verbose_global)
+    progress_indication (_ ("Track...") + " ");
+  
+  int channel = 0;
+  for (vsize i = 0; i < audio_staffs_.size (); i++)
     {
-      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);
-  midi_track.add (Moment (0), &generate);
-
-  str = _f ("from musical definition: %s", origin_str_);
+      Audio_staff *s = audio_staffs_[i];
+      if (be_verbose_global)
+	progress_indication ("[" + to_string (i));
 
-  Midi_text from (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &from);
+      int midi_channel =  s->channel_;
 
-  Midi_text track_name (Midi_text::TRACK_NAME, "Track "
-			+ String_convert::i2dec_str (0, 0, '0'));
-  midi_track.add (Moment (0), &track_name);
+      if (midi_channel < 0)
+	{
+	  midi_channel = channel;
+	  channel ++;
+	  /*
+	    MIDI players tend to ignore instrument settings on
+	    channel 10, the percussion channel.
+	  */
+	  if (channel % 16 == 9)
+	    channel ++;
+	}
 
-  Midi_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4)));
-  midi_track.add (Moment (0), &tempo);
+      /*
+	Huh? Why does each staff also have a separate channel? We
+	should map channels to voices, not staves. --hwn.
+      */
+      if (midi_channel > 15)
+	{
+	  warning (_ ("MIDI channel wrapped around"));
+	  warning (_ ("remapping modulo 16"));
 
-  midi_stream << midi_track;
-}
+	  midi_channel = midi_channel % 16; 
+	}
 
-void
-Performance::add_staff (Audio_staff* l)
-{
-  audio_staff_l_arr_.push (l);
+      s->output (midi_stream, midi_channel);
+      if (be_verbose_global)
+	progress_indication ("]");
+    }
 }
-
 void
 Performance::add_element (Audio_element *p)
 {
-  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
+  audio_elements_.push_back (p);
 }
 
 void
-Performance::process()
+Performance::write_output (string out) const
 {
-  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);
-  *mlog << _f ("MIDI output to %s...", out) << endl;
-  target_str_global_array.push (out);
+  message (_f ("MIDI output to `%s'...", out));
 
   output (midi_stream);
-  *mlog << endl;
+  progress_indication ("\n");
+}
+
+
+void
+Performance::process ()
+{
 }