X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=59cc64a2e25c31de2d6036670de92b1c0cce71ba;hb=9ec9ed150f9f9841d058afb3e30746fc1b89b954;hp=ed74df07b46ec88ec74d594dc39a2aa29f823335;hpb=1edc2436a028cb2d1be8786ab0972a95b0985d42;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index ed74df07b4..59cc64a2e2 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -1,125 +1,109 @@
 /*
-  audio-score.cc -- implement Performance
+  performance.cc -- implement Performance
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (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 "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 "string-convert.hh"
+#include "warn.hh"
 
 Performance::Performance ()
 {
-  midi_l_ =0;
+  midi_ = 0;
 }
 
-void
-Performance::add (Audio_column* p)
+Performance::~Performance ()
 {
-  p->performance_l_ = this;
-  audio_column_p_list_.bottom().add (p);
+  junk_pointers (audio_elements_);
 }
 
 void
-Performance::output (Midi_stream& midi_stream_r)
+Performance::output (Midi_stream &midi_stream)
 {
-  int tracks_i = audio_staff_l_list_.size() + 1;
+  int tracks_ = audio_staffs_.size ();
+
   // ugh
-  int clocks_per_4_i = 384;
-  midi_stream_r << Midi_header (1, tracks_i, clocks_per_4_i);
-  output_header_track (midi_stream_r);
-  int n = 1;
-  for (PCursor<Audio_staff*> i (audio_staff_l_list_); i.ok(); i++)
-    i->output (midi_stream_r, n++);
-}
+  int clocks_per_4 = 384;
 
-void
-Performance::output_header_track (Midi_stream& midi_stream_r)
-{
-  Midi_track midi_track;
+  midi_stream << Midi_header (1, tracks_, clocks_per_4);
+  message (_ ("Track...") + " ");
   
-  time_t t = time (0);
-
-  // perhaps multiple text events?
-  String str = String ("Creator: ") + get_version_str() + "\n";
-
-  Midi_text creator (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &creator);
-
-  str = "Automatically generated at ";
-  str += ctime (&t);
-  str = str.left_str (str.length_i() - 1);
-  str += "\n";
-  Midi_text generate (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &generate);
-
-  str = "from musical definition: ";
-
-  str += origin_str_;
-  Midi_text from (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &from);
-
-  Midi_text track_name (Midi_text::TRACK_NAME, "Track " 
-			+ String_convert::i2dec_str (0, 0, '0'));
-  midi_track.add (Moment (0), &track_name);
-
-  Midi_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4)));
-  midi_track.add (Moment (0), &tempo);
-
-  midi_stream_r  << midi_track;
+  int channel = 0;
+  for (vsize i = 0; i < audio_staffs_.size (); i++)
+    {
+      Audio_staff *s = audio_staffs_[i];
+      if (be_verbose_global)
+	progress_indication ("[" + to_string (i));
+
+      int midi_channel =  s->channel_;
+
+      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 ++;
+	}
+
+      /*
+	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_channel = midi_channel % 16; 
+	}
+
+      s->output (midi_stream, midi_channel);
+      if (be_verbose_global)
+	progress_indication ("]");
+    }
 }
-
 void
-Performance::add_staff (Audio_staff* l)
+Performance::add_element (Audio_element *p)
 {
-  audio_staff_l_list_.bottom().add (l);
+  audio_elements_.push_back (p);
 }
 
 void
-Performance::add (Audio_element *p)
+Performance::write_output (string out)
 {
-  audio_elem_p_list_.bottom().add (p);
-}
+  if (out == "-")
+    out = "lelie.midi";
 
-void
-Performance::print() const
-{    
-#ifndef NPRINT
-  DOUT << "Performance { ";
-  DOUT << "Items: ";
-  for (PCursor<Audio_element*> i (audio_elem_p_list_.top ()); i.ok (); i++)
-    i->print ();
-  
-  DOUT << "\ncolumns: ";
-  for (PCursor<Audio_column*> i (audio_column_p_list_); i.ok(); i++)
-    i->print();
-  DOUT << "}\n";
-#endif 
-}
-
-void
-Performance::process()
-{
-  print ();
-  
-  String out=midi_l_->outfile_str_;
-  if (out.empty_b ())
-    out = default_out_str_ + ".midi";
+  /* Maybe a bit crude, but we had this before */
+  File_name file_name (out);
+  file_name.ext_ = "midi";
+  out = file_name.to_string ();
 
   Midi_stream midi_stream (out);
-  *mlog << "MIDI output to " << out<< " ..." << endl;    
+  message (_f ("MIDI output to `%s'...", out));
 
   output (midi_stream);
-  *mlog << endl;
+  progress_indication ("\n");
 }
+
+