[SCM] hydrogen packaging branch, master, updated. c1ebe0bf09c1ecd0fb25fd8c5c9fb901551f74d4

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0b189ab83f57a94523cd225902feb1252de2b64e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Feb 13 06:24:33 2010 +0100

    Add patches 09 and 10 adjusting PortAudio and PortMIDI support to v2 API.

diff --git a/patches/portaudio.patch b/debian/patches/09_portaudio_v2.patch
similarity index 67%
copy from patches/portaudio.patch
copy to debian/patches/09_portaudio_v2.patch
index 02cb680..f331bc5 100644
--- a/patches/portaudio.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -1,7 +1,7 @@
-diff --git a/libs/hydrogen/src/IO/PortAudioDriver.h b/libs/hydrogen/src/IO/PortAudioDriver.h
-index 5dda3f5..36c5196 100644
---- libs/hydrogen/src/IO/PortAudioDriver.h
-+++ libs/hydrogen/src/IO/PortAudioDriver.h
+Index: hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h
+===================================================================
+--- hydrogen.orig/libs/hydrogen/src/IO/PortAudioDriver.h	2010-02-13 06:16:54.000000000 +0100
++++ hydrogen/libs/hydrogen/src/IO/PortAudioDriver.h	2010-02-13 06:17:37.000000000 +0100
 @@ -28,6 +28,11 @@
  
  #ifdef PORTAUDIO_SUPPORT
@@ -14,11 +14,11 @@ index 5dda3f5..36c5196 100644
  #include <inttypes.h>
  #include <portaudio.h>
  
-diff --git a/libs/hydrogen/src/IO/portaudio_driver.cpp b/libs/hydrogen/src/IO/portaudio_driver.cpp
-index a6df93e..2b42fa1 100644
---- libs/hydrogen/src/IO/portaudio_driver.cpp
-+++ libs/hydrogen/src/IO/portaudio_driver.cpp
-@@ -10,10 +10,11 @@ namespace H2Core
+Index: hydrogen/libs/hydrogen/src/IO/portaudio_driver.cpp
+===================================================================
+--- hydrogen.orig/libs/hydrogen/src/IO/portaudio_driver.cpp	2010-02-13 06:16:54.000000000 +0100
++++ hydrogen/libs/hydrogen/src/IO/portaudio_driver.cpp	2010-02-13 06:17:37.000000000 +0100
+@@ -10,10 +10,11 @@
  {
  
  int portAudioCallback(
@@ -32,7 +32,7 @@ index a6df93e..2b42fa1 100644
      void *userData
  )
  {
-@@ -66,9 +67,16 @@ int PortAudioDriver::connect()
+@@ -66,9 +67,16 @@
  	m_pOut_L = new float[ m_nBufferSize ];
  	m_pOut_R = new float[ m_nBufferSize ];
  
@@ -51,7 +51,7 @@ index a6df93e..2b42fa1 100644
  	if ( err != paNoError ) {
  		ERRORLOG( "Portaudio error in Pa_Initialize: " + QString( Pa_GetErrorText( err ) ) );
  		return 1;
-@@ -81,9 +89,9 @@ int PortAudioDriver::connect()
+@@ -81,9 +89,9 @@
  	          paFloat32,      /* 32 bit floating point output */
  	          m_nSampleRate,          // sample rate
  	          m_nBufferSize,            // frames per buffer
diff --git a/debian/patches/10_portmidi_v2.patch b/debian/patches/10_portmidi_v2.patch
new file mode 100644
index 0000000..21f2e42
--- /dev/null
+++ b/debian/patches/10_portmidi_v2.patch
@@ -0,0 +1,22 @@
+Index: hydrogen/libs/hydrogen/src/IO/portmidi_driver.cpp
+===================================================================
+--- hydrogen.orig/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-02-13 06:16:54.000000000 +0100
++++ hydrogen/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-02-13 06:17:46.000000000 +0100
+@@ -31,7 +31,7 @@
+ #ifdef PORTMIDI_SUPPORT
+ 
+ #include <porttime.h>
+-#define TIME_PROC ((long (*)(void *)) Pt_Time)
++#define TIME_PROC ((PmTimestamp (*)(void *)) Pt_Time)
+ #define TIME_START Pt_Start(1, 0, 0) /* timer started w/millisecond accuracy */
+ 
+ #include <pthread.h>
+@@ -47,7 +47,7 @@
+ 	_INFOLOG( "PortMidiDriver_thread starting" );
+ 
+ 	PmError status;
+-	PmError length;
++	int length;
+ 	PmEvent buffer[1];
+ 	while ( instance->m_bRunning ) {
+ 		status = Pm_Poll( instance->m_pMidiIn );
diff --git a/debian/patches/series b/debian/patches/series
index bbdd1dd..fe1a2a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 #03_gcc43.patch
 #07_gcc44.patch
 #08_550303_kbsd.patch
+09_portaudio_v2.patch
+10_portmidi_v2.patch

-- 
hydrogen packaging