X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=9f840efd2524eedc28e7204a13d5c5f47d97a958;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=1bc547a5a8b9e987464fa6c5a70b7b76051f2d15;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index 1bc547a5a8..9f840efd25 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 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
@@ -23,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"
@@ -36,7 +37,8 @@ using namespace std;
 
 Performance::Performance (bool ports)
   : midi_ (0),
-    ports_ (ports)
+    ports_ (ports),
+    header_ (SCM_EOL)
 {
 }
 
@@ -46,22 +48,61 @@ 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...") + " ");
+  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));
-      s->output (midi_stream, i, ports_);
-      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);
     }
 }
 
@@ -72,7 +113,7 @@ 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";
@@ -84,7 +125,7 @@ Performance::write_output (string out) const
   Midi_stream midi_stream (out);
   message (_f ("MIDI output to `%s'...", out));
 
-  output (midi_stream);
+  output (midi_stream, performance_name);
   progress_indication ("\n");
 }
 
@@ -92,9 +133,3 @@ void
 Performance::process ()
 {
 }
-
-Performance *
-unsmob_performance (SCM x)
-{
-  return dynamic_cast<Performance *> (unsmob_music_output (x));
-}