X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=f462c3322952cc2d8b0f3d49a8e04f3e5e5d1f14;hb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;hp=bcd8b42c50f12eb54574fa5443829f9a33b98e6f;hpb=ba8eee4036ebb86c32f23c784adcf3bf2ef5fe3b;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index bcd8b42c50..f462c33229 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"
@@ -35,8 +36,8 @@ using namespace std;
 #include "warn.hh"
 
 Performance::Performance (bool ports)
-  : midi_ (0)
-  , ports_ (ports)
+  : midi_ (0),
+    ports_ (ports)
 {
 }
 
@@ -51,17 +52,21 @@ Performance::output (Midi_stream &midi_stream) 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 ("]");
+      debug_output ("[" + ::to_string (i), true);
+      s->output (midi_stream, i, ports_, moment_to_ticks (start_mom));
+      debug_output ("]", false);
     }
 }
 
@@ -88,14 +93,7 @@ Performance::write_output (string out) const
   progress_indication ("\n");
 }
 
-
 void
 Performance::process ()
 {
 }
-
-Performance *
-unsmob_performance (SCM x)
-{
-  return dynamic_cast<Performance*> (unsmob_music_output (x));
-}