Merge remote-tracking branch 'origin/translation'

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 33f6fb971ee13de6d803fa21d4ddcfcd5f555b20..136ef95139896067f97935ba16e8f358491d4c3a 100644 (file)
--- 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--2014 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
@@ -34,9 +34,10 @@ using namespace std;
 #include "string-convert.hh"
 #include "warn.hh"
 
-Performance::Performance ()
+Performance::Performance (bool ports)
+  : midi_ (0),
+    ports_ (ports)
 {
-  midi_ = 0;
 }
 
 Performance::~Performance ()
@@ -50,47 +51,17 @@ 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...") + " ");
-  
-  int channel = 0;
+  debug_output (_ ("Track...") + " ", false);
+
   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_);
+      debug_output ("]", false);
     }
 }
+
 void
 Performance::add_element (Audio_element *p)
 {
@@ -114,7 +85,6 @@ Performance::write_output (string out) const
   progress_indication ("\n");
 }
 
-
 void
 Performance::process ()
 {
@@ -123,5 +93,5 @@ Performance::process ()
 Performance *
 unsmob_performance (SCM x)
 {
-  return dynamic_cast<Performance*> (unsmob_music_output (x));
+  return dynamic_cast<Performance *> (unsmob_music_output (x));
 }