X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=f462c3322952cc2d8b0f3d49a8e04f3e5e5d1f14;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=136ef95139896067f97935ba16e8f358491d4c3a;hpb=40aac0ae57ee113faa860ba221d83d9e6312173e;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index 136ef95139..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--2014 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"
@@ -53,11 +54,18 @@ Performance::output (Midi_stream &midi_stream) const
   midi_stream.write (Midi_header (1, tracks_, 384));
   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];
       debug_output ("[" + ::to_string (i), true);
-      s->output (midi_stream, i, ports_);
+      s->output (midi_stream, i, ports_, moment_to_ticks (start_mom));
       debug_output ("]", false);
     }
 }
@@ -89,9 +97,3 @@ void
 Performance::process ()
 {
 }
-
-Performance *
-unsmob_performance (SCM x)
-{
-  return dynamic_cast<Performance *> (unsmob_music_output (x));
-}