[SCM] hydrogen/master: portaudio patch refreshed/enabled.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 287d924968716b73055f3e06f5d42b3391a27e90
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Nov 11 00:02:08 2016 +0100

    portaudio patch refreshed/enabled.

diff --git a/debian/patches/09_portaudio_v2.patch b/debian/patches/09_portaudio_v2.patch
index 54c8dfb..3307add 100644
--- a/debian/patches/09_portaudio_v2.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -3,8 +3,10 @@
  src/core/src/IO/portaudio_driver.cpp |   10 ++++++++--
  2 files changed, 11 insertions(+), 2 deletions(-)
 
---- hydrogen.orig/src/core/src/IO/PortAudioDriver.h
-+++ hydrogen/src/core/src/IO/PortAudioDriver.h
+Index: hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
+===================================================================
+--- hydrogen.orig/src/core/include/hydrogen/IO/PortAudioDriver.h
++++ hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
 @@ -30,6 +30,9 @@
  
  #ifdef H2CORE_HAVE_PORTAUDIO
@@ -15,9 +17,11 @@
  #include <inttypes.h>
  #include <portaudio.h>
  
+Index: hydrogen/src/core/src/IO/portaudio_driver.cpp
+===================================================================
 --- hydrogen.orig/src/core/src/IO/portaudio_driver.cpp
 +++ hydrogen/src/core/src/IO/portaudio_driver.cpp
-@@ -67,7 +67,13 @@ int PortAudioDriver::connect()
+@@ -68,7 +68,13 @@ int PortAudioDriver::connect()
  	m_pOut_L = new float[ m_nBufferSize ];
  	m_pOut_R = new float[ m_nBufferSize ];
  
@@ -32,12 +36,12 @@
  
  
  	if ( err != paNoError ) {
-@@ -83,7 +89,7 @@ int PortAudioDriver::connect()
- 			  m_nSampleRate,          // sample rate
- 			  m_nBufferSize,            // frames per buffer
- 			  portAudioCallback, /* specify our custom callback */
--			  this );        /* pass our data through to callback */
-+			  (void*)this );        /* pass our data through to callback */
+@@ -84,7 +90,7 @@ int PortAudioDriver::connect()
+ 				m_nSampleRate,          // sample rate
+ 				m_nBufferSize,            // frames per buffer
+ 				portAudioCallback, /* specify our custom callback */
+-				this );        /* pass our data through to callback */
++				(void*)this );        /* pass our data through to callback */
  
  
  	if ( err != paNoError ) {
diff --git a/debian/patches/series b/debian/patches/series
index d8a7b7b..960f651 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-#09_portaudio_v2.patch
+09_portaudio_v2.patch
 1001_rubberband_path.patch
 1005_name_shouldnt_repeat_genericname.patch
 1006_porttime.patch

-- 
hydrogen packaging