[SCM] hydrogen/master: Drop 1007_off_by_one_in_jackmidi.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Oct 4 15:24:54 UTC 2013
The following commit has been merged in the master branch:
commit ef91c085a36ac68a1c5bd8ae9fc75a2423cb675a
Author: Alessio Treglia <alessio at debian.org>
Date: Fri Oct 4 16:02:27 2013 +0100
Drop 1007_off_by_one_in_jackmidi.patch, applied upstream.
diff --git a/debian/patches/1007_off_by_one_in_jackmidi.patch b/debian/patches/1007_off_by_one_in_jackmidi.patch
deleted file mode 100644
index e09957a..0000000
--- a/debian/patches/1007_off_by_one_in_jackmidi.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Fix off-by-one error in JACK MIDI
- Fixed bug whereby a MIDI event is only sent when there is another
- one queued.
-Author: Roland Mas <lolando at debian.org>
-Bug-Debian: http://bugs.debian.org/661725
----
- src/core/src/IO/jack_midi_driver.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- hydrogen.orig/src/core/src/IO/jack_midi_driver.cpp
-+++ hydrogen/src/core/src/IO/jack_midi_driver.cpp
-@@ -234,11 +234,12 @@ JackMidiDriver::JackMidiRead(jack_nframe
- if (buffer == NULL)
- break;
-
-- memcpy(buffer, jack_buffer + (4 * rx_in_pos) + 1, len);
- t++;
- rx_in_pos++;
- if (rx_in_pos >= JACK_MIDI_BUFFER_MAX)
- rx_in_pos = 0;
-+
-+ memcpy(buffer, jack_buffer + (4 * rx_in_pos) + 1, len);
- }
- unlock();
- }
-@@ -394,6 +395,13 @@ void JackMidiDriver::handleQueueNote(Not
- if (vel < 0 || vel > 127)
- return;
-
-+ buffer[0] = 0x80 | channel; /* note off */
-+ buffer[1] = key;
-+ buffer[2] = 0;
-+ buffer[3] = 0;
-+
-+ JackMidiOutEvent(buffer, 3);
-+
- buffer[0] = 0x90 | channel; /* note on */
- buffer[1] = key;
- buffer[2] = vel;
diff --git a/debian/patches/series b/debian/patches/series
index 42698ec..cf33343 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
1005_name_shouldnt_repeat_genericname.patch
1006_porttime.patch
ftbfs-gcc-4.7.diff
-1007_off_by_one_in_jackmidi.patch
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list