Map voices to channels in MIDI output.

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 0bfe37ee826581ccab7815b50afd71930725740f..b07c8604cfde4c445f1fc1259d64e3c181cab29f 100644 (file)
--- 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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 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"
@@ -17,7 +28,7 @@ using namespace std;
 #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"
@@ -34,41 +45,20 @@ Performance::~Performance ()
 }
 
 void
-Performance::output (Midi_stream &midi_stream)
+Performance::output (Midi_stream &midi_stream) const
 {
   int tracks_ = audio_staffs_.size ();
 
-  // ugh
-  int clocks_per_4 = 384;
-
-  midi_stream << Midi_header (1, tracks_, clocks_per_4);
-  message (_ ("Track...") + " ");
-  int channel = 0;
+  midi_stream.write (Midi_header (1, tracks_, 384));
+  if (be_verbose_global)
+    progress_indication (_ ("Track...") + " ");
+  
   for (vsize i = 0; i < audio_staffs_.size (); i++)
     {
       Audio_staff *s = audio_staffs_[i];
       if (be_verbose_global)
        progress_indication ("[" + to_string (i));
-
-      /*
-       MIDI players tend to ignore instrument settings on
-       channel 10, the percussion channel by default.
-      */
-      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 (channel > 15)
-       {
-         warning (_ ("MIDI channel wrapped around"));
-         warning (_ ("remapping modulo 16"));
-       }
-
-      s->output (midi_stream, channel);
-      channel ++;
+      s->output (midi_stream, i);
       if (be_verbose_global)
        progress_indication ("]");
     }
@@ -81,14 +71,13 @@ Performance::add_element (Audio_element *p)
 }
 
 void
-Performance::write_output (string out)
+Performance::write_output (string out) const
 {
   if (out == "-")
     out = "lelie.midi";
 
   /* 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);
@@ -99,3 +88,13 @@ Performance::write_output (string out)
 }
 
 
+void
+Performance::process ()
+{
+}
+
+Performance *
+unsmob_performance (SCM x)
+{
+  return dynamic_cast<Performance*> (unsmob_music_output (x));
+}