[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 48bb252e1c585a84c6d68888ee66aa7eaf05b925
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 4 16:01:18 2013 +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 bff5d10..54c8dfb 100644
--- a/debian/patches/09_portaudio_v2.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -1,16 +1,14 @@
 ---
- src/core/src/IO/PortAudioDriver.h    |    5 +++++
- src/core/src/IO/portaudio_driver.cpp |   13 ++++++++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
+ src/core/src/IO/PortAudioDriver.h    |    3 +++
+ 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
-@@ -30,6 +30,11 @@
+@@ -30,6 +30,9 @@
  
  #ifdef H2CORE_HAVE_PORTAUDIO
  
-+
-+
 +#define PortAudioStream PaStream
 +#define PaTimestamp PaTime
 +
@@ -19,31 +17,27 @@
  
 --- hydrogen.orig/src/core/src/IO/portaudio_driver.cpp
 +++ hydrogen/src/core/src/IO/portaudio_driver.cpp
-@@ -67,9 +67,16 @@ int PortAudioDriver::connect()
+@@ -67,7 +67,13 @@ int PortAudioDriver::connect()
  	m_pOut_L = new float[ m_nBufferSize ];
  	m_pOut_R = new float[ m_nBufferSize ];
  
 -	int err = Pa_Initialize();
--	
 +	PaError err = Pa_Initialize();
- 	
++
 +	typedef struct
 +	{
 +    		float left_phase;
 +    		float right_phase;
 +	} paTestData;
-+
-+
-+
+ 
+ 
  	if ( err != paNoError ) {
- 		ERRORLOG( "Portaudio error in Pa_Initialize: " + QString( Pa_GetErrorText( err ) ) );
- 		return 1;
-@@ -83,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 */
- 	
- 	
+@@ -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 */
+ 
+ 
  	if ( err != paNoError ) {

-- 
hydrogen packaging