X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=8ae1edfaf35af5fe869361a4e2d1def28883d3e0;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=87392b5153dfcac0fc7f0a25df47df6b60bf9060;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index 87392b5153..8ae1edfaf3 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,146 +3,114 @@
 
   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 "main.hh"
-#include "midi-def.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
+#include "performance.hh"
+
+#include <ctime>
+using namespace std;
+
 #include "audio-column.hh"
 #include "audio-staff.hh"
-#include "performance.hh"
-#include "score.hh"
-#include "file-results.hh"
+#include "file-name.hh"
+#include "international.hh"
 #include "lily-version.hh"
+#include "main.hh"
+#include "midi-chunk.hh"
+#include "midi-stream.hh"
+#include "score.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
 Performance::Performance ()
 {
-  midi_l_ =0;
+  midi_ = 0;
 }
 
-void
-Performance::add_column (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) const
 {
-  int tracks_i = audio_staff_l_list_.size() + 1;
-  // 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 tracks_ = audio_staffs_.size ();
 
-void
-Performance::output_header_track (Midi_stream& midi_stream_r)
-{
-  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);
+      Audio_staff *s = audio_staffs_[i];
+      if (be_verbose_global)
+	progress_indication ("[" + to_string (i));
 
-  str = _f ("from musical definition: %s", origin_str_);
+      int midi_channel =  s->channel_;
 
-  Midi_text from (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &from);
+      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_text track_name (Midi_text::TRACK_NAME, "Track "
-			+ String_convert::i2dec_str (0, 0, '0'));
-  midi_track.add (Moment (0), &track_name);
+      /*
+	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_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4)));
-  midi_track.add (Moment (0), &tempo);
+	  midi_channel = midi_channel % 16; 
+	}
 
-  midi_stream_r  << midi_track;
+      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_element (Audio_element *p)
+Performance::write_output (string out) const
 {
-  audio_elem_p_list_.bottom().add (p);
+  if (out == "-")
+    out = "lelie.midi";
+
+  /* Maybe a bit crude, but we had this before */
+  File_name file_name (out);
+  out = file_name.to_string ();
+
+  Midi_stream midi_stream (out);
+  message (_f ("MIDI output to `%s'...", out));
+
+  output (midi_stream);
+  progress_indication ("\n");
 }
 
+
 void
-Performance::print() const
+Performance::process ()
 {
-#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()
+Performance *
+unsmob_performance (SCM x)
 {
-  print ();
-
-  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);
-  *mlog << _f ("MIDI output to %s...", out) << endl;
-  target_str_global_array.push (out);
-
-  output (midi_stream);
-  *mlog << endl;
+  return dynamic_cast<Performance*> (unsmob_music_output (x));
 }