[SCM] hydrogen/master: Refresh debian/patches/09_portaudio_v2.patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 77b0c47f372d0a5e8901a5ed2798bdcaa4dabd22
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 27 02:31:20 2012 +0100

    Refresh debian/patches/09_portaudio_v2.patch.

diff --git a/debian/patches/09_portaudio_v2.patch b/debian/patches/09_portaudio_v2.patch
index 4e64bdd..79b52ee 100644
--- a/debian/patches/09_portaudio_v2.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -1,13 +1,13 @@
 ---
- libs/hydrogen/src/IO/PortAudioDriver.h    |    5 +++++
- libs/hydrogen/src/IO/portaudio_driver.cpp |   20 ++++++++++++++------
- 2 files changed, 19 insertions(+), 6 deletions(-)
+ src/core/src/IO/PortAudioDriver.h    |    5 +++++
+ src/core/src/IO/portaudio_driver.cpp |   13 ++++++++++---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
 
---- hydrogen.orig/libs/hydrogen/src/IO/PortAudioDriver.h
-+++ hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h
+--- hydrogen.orig/src/core/src/IO/PortAudioDriver.h
++++ hydrogen/src/core/src/IO/PortAudioDriver.h
 @@ -28,6 +28,11 @@
  
- #ifdef PORTAUDIO_SUPPORT
+ #ifdef H2CORE_HAVE_PORTAUDIO
  
 +
 +
@@ -17,23 +17,9 @@
  #include <inttypes.h>
  #include <portaudio.h>
  
---- hydrogen.orig/libs/hydrogen/src/IO/portaudio_driver.cpp
-+++ hydrogen/libs/hydrogen/src/IO/portaudio_driver.cpp
-@@ -10,10 +10,11 @@ namespace H2Core
- {
- 
- int portAudioCallback(
--    void *inputBuffer,
-+    const void *inputBuffer,
-     void *outputBuffer,
-     unsigned long framesPerBuffer,
--    PaTimestamp outTime,
-+    const PaStreamCallbackTimeInfo* timeInfo,
-+    PaStreamCallbackFlags statusFlags,
-     void *userData
- )
- {
-@@ -66,9 +67,16 @@ int PortAudioDriver::connect()
+--- hydrogen.orig/src/core/src/IO/portaudio_driver.cpp
++++ hydrogen/src/core/src/IO/portaudio_driver.cpp
+@@ -67,9 +67,16 @@ int PortAudioDriver::connect()
  	m_pOut_L = new float[ m_nBufferSize ];
  	m_pOut_R = new float[ m_nBufferSize ];
  
@@ -52,12 +38,9 @@
  	if ( err != paNoError ) {
  		ERRORLOG( "Portaudio error in Pa_Initialize: " + QString( Pa_GetErrorText( err ) ) );
  		return 1;
-@@ -81,9 +89,9 @@ int PortAudioDriver::connect()
- 	          paFloat32,      /* 32 bit floating point output */
+@@ -83,7 +90,7 @@ int PortAudioDriver::connect()
  	          m_nSampleRate,          // sample rate
  	          m_nBufferSize,            // frames per buffer
--	          0,              // number of buffers, if zero then use default minimum
-+	          //0,              // number of buffers, if zero then use default minimum
  	          portAudioCallback, /* specify our custom callback */
 -	          this );        /* pass our data through to callback */
 +	          (void*)this );        /* pass our data through to callback */

-- 
hydrogen packaging