[SCM] jack-keyboard/master: Remove 0005-fix_pianola_mode.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jul 5 07:30:56 UTC 2011
The following commit has been merged in the master branch:
commit 0fcaf9c90d8194e4536c73c43a3ebf02815de4a3
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jul 5 09:29:53 2011 +0200
Remove 0005-fix_pianola_mode.patch, applied upstream.
diff --git a/debian/patches/0005-fix_pianola_mode.patch b/debian/patches/0005-fix_pianola_mode.patch
deleted file mode 100644
index 3f1efc9..0000000
--- a/debian/patches/0005-fix_pianola_mode.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: jack-keyboard should pass through incoming MIDI
- messages but replace the channel number with its own. The
- code only recognized incoming messages sent on MIDI channel
- 0 though, and did not rewrite the channel at all.
-Author: Dan Muresan <danmbox3 at yahoo.ro>
-Bug-Debian: http://bugs.debian.org/625282
-Forwarded: Edward Tomasz Napierala <trasz at freebsd.org>
----
- src/jack-keyboard.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
---- jack-keyboard.orig/src/jack-keyboard.c
-+++ jack-keyboard/src/jack-keyboard.c
-@@ -199,23 +199,29 @@ process_received_message_async(gpointer
- {
- int i;
- struct MidiMessage *ev = (struct MidiMessage *)evp;
-+ int b0 = ev->data [0], b1 = ev->data [1];
-
-- if (ev->data[0] == MIDI_RESET || (ev->data[0] == MIDI_CONTROLLER &&
-- (ev->data[1] == MIDI_ALL_NOTES_OFF || ev->data[1] == MIDI_ALL_SOUND_OFF))) {
-+ /* Strip channel from channel messages */
-+ if (b0 >= 0x80 && b0 <= 0xEF)
-+ b0 = b0 & 0xF0;
-+
-+ if (b0 == MIDI_RESET || (b0 == MIDI_CONTROLLER &&
-+ (b1 == MIDI_ALL_NOTES_OFF || b1 == MIDI_ALL_SOUND_OFF))) {
-
- for (i = 0; i < NNOTES; i++) {
- piano_keyboard_set_note_off(keyboard, i);
- }
- }
-
-- if (ev->data[0] == MIDI_NOTE_ON) {
-+ if (b0 == MIDI_NOTE_ON) {
- piano_keyboard_set_note_on(keyboard, ev->data[1]);
- }
-
-- if (ev->data[0] == MIDI_NOTE_OFF) {
-+ if (b0 == MIDI_NOTE_OFF) {
- piano_keyboard_set_note_off(keyboard, ev->data[1]);
- }
-
-+ ev->data [0] = b0 | channel;
- queue_message(ev);
-
- return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index d5460de..8cf0327 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0005-fix_pianola_mode.patch
1001-manpage_errors.patch
2001-hide_no_lash_warning.patch
--
jack-keyboard packaging
More information about the pkg-multimedia-commits
mailing list