From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 8 Mar 1999 21:07:06 +0000 (+0100)
Subject: patch::: 1.1.33.jcn3: silly midi fix
X-Git-Tag: release/1.1.34~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3efa2752d62ffd4ae204e40a9cfa0fe3279deb66;p=lilypond.git

patch::: 1.1.33.jcn3: silly midi fix
---

diff --git a/VERSION b/VERSION
index f994aaa2e0..2ec9ff54a9 100644
--- 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 96c992c3fe..83461eb591 100644
--- 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 87392b5153..949f6fcad0 100644
--- 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