[SCM] qmidiarp/master: Dropped patches, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Dec 27 01:10:03 UTC 2011


The following commit has been merged in the master branch:
commit e9090ceacf28e49a34508e8a07e13c78026a38a7
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Dec 27 02:09:52 2011 +0100

    Dropped patches, applied upstream.
    
    Git-Dch: Ignore

diff --git a/debian/patches/0001-Fixed-typo-in-manpage.patch b/debian/patches/0001-Fixed-typo-in-manpage.patch
deleted file mode 100644
index a34d1ff..0000000
--- a/debian/patches/0001-Fixed-typo-in-manpage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Origin: upstream, commit:2439aac662d002abdf48ffe2932544442f86740a
-Subject: Fixed typo in manpage (thanks Brendan Jones)
----
- man/qmidiarp.1 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- qmidiarp.orig/man/qmidiarp.1
-+++ qmidiarp/man/qmidiarp.1
-@@ -356,7 +356,7 @@ by notes played on the keyboard, and the
- not when
- .B Note Off
- events are received on the input
--.Channel
-+.B Channel
- .PP
- .B "LFO Output panel"
- .PP
diff --git a/debian/patches/0002-Fixed-uninitialized-transport-position-on-startup.patch b/debian/patches/0002-Fixed-uninitialized-transport-position-on-startup.patch
deleted file mode 100644
index 7757913..0000000
--- a/debian/patches/0002-Fixed-uninitialized-transport-position-on-startup.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Origin: upstream, commit:c4821f536f6fe81e12b0d34a12a325e8bf0c29f5
-Description: Fixed uninitialized transport position on startup with JACK MIDI
----
- src/jackdriver.cpp |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- qmidiarp.orig/src/jackdriver.cpp
-+++ qmidiarp/src/jackdriver.cpp
-@@ -35,7 +35,6 @@ JackDriver::JackDriver(
-     void (* tick_callback)(void * context, bool echo_from_trig))
-     : DriverBase(callback_context, midi_event_received_callback, tick_callback, 60e9)
- {
--    transportState = JackTransportStopped;
-     portCount = p_portCount;
-     cbContext = callback_context;
-     trStateCb = p_tr_state_cb;
-@@ -47,9 +46,13 @@ JackDriver::JackDriver(
-  *  JACK driver backend, i.e. portCount > 0 */
-     if (portCount) {
-         callJack(portCount);
-+        transportState = getState();
-         jSampleRate = jack_get_sample_rate(jack_handle);
-         setTransportStatus(false);
-     }
-+    else {
-+        transportState = JackTransportStopped;
-+    }
- }
- void JackDriver::callJack(int port_count)
- {
-@@ -455,7 +458,7 @@ void JackDriver::setTransportStatus(bool
-     else
-         tempo = internalTempo;
- 
--    jackOffsetTick = (long)jpos.frame * TPQN
-+    jackOffsetTick = (uint64_t)jpos.frame * TPQN
-         * tempo / (jpos.frame_rate * 60);
- 
-     m_current_tick = 0;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 366f7bd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fixed-typo-in-manpage.patch
-0002-Fixed-uninitialized-transport-position-on-startup.patch

-- 
qmidiarp packaging



More information about the pkg-multimedia-commits mailing list