patch::: 1.1.33.jcn3: silly midi fix

diff --git a/VERSION b/VERSION
index f994aaa2e0b43ed50046596f816996ef853fd789..2ec9ff54a981c6d99c575d2b2c24327cf6b9442c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=33
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 96c992c3fec5b88060444c18235b55e693ff12e5..83461eb591225f9a4040d72cd8aa8432947f521f 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -20,18 +20,6 @@
 #include "audio-item.hh"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 Midi_chunk::Midi_chunk ()
   : Midi_item (0)
 {

diff --git a/lily/performance.cc b/lily/performance.cc
index 87392b5153dfcac0fc7f0a25df47df6b60bf9060..949f6fcad06c68c8e3d26b18814e45e2af2df79d 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -43,7 +43,16 @@ Performance::output (Midi_stream& midi_stream_r)
   output_header_track (midi_stream_r);
   int n = 1;
   for (PCursor<Audio_staff*> i (audio_staff_l_list_); i.ok(); i++)
-    i->output (midi_stream_r, n++);
+    {
+      /*
+       Aargh, let's hear it for the MIDI standard.
+       MIDI players tend to ignore instrument settings on
+       channel 10, the percussion channel by default.
+       */
+      if (n == 10)
+       n++;
+      i->output (midi_stream_r, n++);
+    }
 }
 
 void