X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=9f840efd2524eedc28e7204a13d5c5f47d97a958;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=e536622f06f550336876ea29f4e3b421df787bce;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index e536622f06..9f840efd25 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -1,9 +1,20 @@
 /*
-  performance.cc -- implement Performance
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "performance.hh"
@@ -12,6 +23,7 @@
 using namespace std;
 
 #include "audio-column.hh"
+#include "audio-item.hh"
 #include "audio-staff.hh"
 #include "file-name.hh"
 #include "international.hh"
@@ -23,9 +35,11 @@ using namespace std;
 #include "string-convert.hh"
 #include "warn.hh"
 
-Performance::Performance ()
+Performance::Performance (bool ports)
+  : midi_ (0),
+    ports_ (ports),
+    header_ (SCM_EOL)
 {
-  midi_ = 0;
 }
 
 Performance::~Performance ()
@@ -34,52 +48,64 @@ Performance::~Performance ()
 }
 
 void
-Performance::output (Midi_stream &midi_stream) const
+Performance::derived_mark () const
+{
+  scm_gc_mark (header_);
+}
+
+SCM
+Performance::get_header () const
+{
+  return header_;
+}
+
+void
+Performance::set_header (SCM module)
+{
+  assert (ly_is_module (module));
+  header_ = module;
+}
+
+void
+Performance::output (Midi_stream &midi_stream,
+                     const string &performance_name) const
 {
   int tracks_ = audio_staffs_.size ();
 
   midi_stream.write (Midi_header (1, tracks_, 384));
-  if (be_verbose_global)
-    progress_indication (_ ("Track...") + " ");
-  
-  int channel = 0;
+  debug_output (_ ("Track...") + " ", false);
+
+  //Find the first Audio_item in the performance, so all staves start
+  //at the same tick.
+  Moment start_mom = 0;
+  for (vsize i = 0; i < audio_elements_.size (); i++)
+    if (Audio_item *item = dynamic_cast<Audio_item *>(audio_elements_[i]))
+      start_mom = min (start_mom, item->audio_column_->when ());
+
   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 ("]");
+      if (Audio_control_track_staff *c =
+          dynamic_cast<Audio_control_track_staff *>(s))
+        {
+          // The control track, created by Control_track_performer, should
+          // contain a placeholder for the name of the MIDI sequence as its
+          // initial audio element.  Fill in the name of the sequence to
+          // this element before outputting MIDI.
+          assert (!c->audio_items_.empty ());
+          Audio_text *text =
+            dynamic_cast<Audio_text *>(c->audio_items_.front ());
+          assert (text != 0);
+          assert (text->type_ == Audio_text::TRACK_NAME);
+          assert (text->text_string_ == "control track");
+          text->text_string_ = performance_name;
+        }
+      debug_output ("[" + ::to_string (i), true);
+      s->output (midi_stream, i, ports_, moment_to_ticks (start_mom));
+      debug_output ("]", false);
     }
 }
+
 void
 Performance::add_element (Audio_element *p)
 {
@@ -87,24 +113,22 @@ Performance::add_element (Audio_element *p)
 }
 
 void
-Performance::write_output (string out) const
+Performance::write_output (string out, const string &performance_name) const
 {
   if (out == "-")
     out = "lelie.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);
   message (_f ("MIDI output to `%s'...", out));
 
-  output (midi_stream);
+  output (midi_stream, performance_name);
   progress_indication ("\n");
 }
 
-
 void
 Performance::process ()
 {