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

diff --git a/lily/performance.cc b/lily/performance.cc
index 2c02fc32f9..f462c33229 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,20 +23,22 @@
 using namespace std;
 
 #include "audio-column.hh"
+#include "audio-item.hh"
 #include "audio-staff.hh"
 #include "file-name.hh"
 #include "international.hh"
 #include "lily-version.hh"
 #include "main.hh"
-#include "midi-item.hh"
+#include "midi-chunk.hh"
 #include "midi-stream.hh"
 #include "score.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 
-Performance::Performance ()
+Performance::Performance (bool ports)
+  : midi_ (0),
+    ports_ (ports)
 {
-  midi_ = 0;
 }
 
 Performance::~Performance ()
@@ -38,48 +51,25 @@ Performance::output (Midi_stream &midi_stream) const
 {
   int tracks_ = audio_staffs_.size ();
 
-  midi_stream << Midi_header (1, tracks_, 384);
-  if (be_verbose_global)
-    progress_indication (_ ("Track...") + " ");
-  
-  int channel = 0;
+  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];
-      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 ("]");
+      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)
 {
@@ -94,7 +84,6 @@ Performance::write_output (string out) const
 
   /* 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);
@@ -104,7 +93,6 @@ Performance::write_output (string out) const
   progress_indication ("\n");
 }
 
-
 void
 Performance::process ()
 {