Hi all,

I couldn't follow the progress and the current situation of hydrogen
lately. I made this simple patch that makes hydrogen build against
portmidi-184 or higher. I tested it on portmidi-184 and on
portmidi-200.

This patch makes a change in the scons file in addition to the source
file changes so it will probably not apply to your trunk. In
particular, the new portmidi does not come with a libporttime.so
module, everything is in the libportmidi.so now.

I saw a series of emails about switching to cmake but I am not sure if
that's done yet. The patch is against 0.9.4.

All the best,
Orcan
diff -rupN hydrogen-0.9.4.old/libs/hydrogen/src/IO/portmidi_driver.cpp hydrogen-0.9.4.new/libs/hydrogen/src/IO/portmidi_driver.cpp
--- hydrogen-0.9.4.old/libs/hydrogen/src/IO/portmidi_driver.cpp	2009-07-14 21:10:17.000000000 -0400
+++ hydrogen-0.9.4.new/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-01-30 01:47:50.000000000 -0500
@@ -31,7 +31,7 @@
 #ifdef PORTMIDI_SUPPORT
 
 #include <porttime.h>
-#define TIME_PROC ((long (*)(void *)) Pt_Time)
+#define TIME_PROC ((int32_t (*)(void *)) Pt_Time)
 #define TIME_START Pt_Start(1, 0, 0) /* timer started w/millisecond accuracy */
 
 #include <pthread.h>
@@ -47,7 +47,7 @@ void* PortMidiDriver_thread( void* param
 	_INFOLOG( "PortMidiDriver_thread starting" );
 
 	PmError status;
-	PmError length;
+	int length;
 	PmEvent buffer[1];
 	while ( instance->m_bRunning ) {
 		status = Pm_Poll( instance->m_pMidiIn );
diff -rupN hydrogen-0.9.4.old/Sconstruct hydrogen-0.9.4.new/Sconstruct
--- hydrogen-0.9.4.old/Sconstruct	2009-09-07 17:31:13.000000000 -0400
+++ hydrogen-0.9.4.new/Sconstruct	2010-01-30 01:48:01.000000000 -0500
@@ -265,7 +265,6 @@ def get_hydrogen_gui( lib_hydrogen , opt
 	if str(env['portaudio']) == "1": env.Append( LIBS = [ "portaudio" ] )
 	if str(env['portmidi']) == "1":
 		env.Append( LIBS = [ "portmidi" ] )
-		env.Append( LIBS = [ "porttime" ] )
 	if str(env['lash']) == "1":
 	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
 
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Hydrogen-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/hydrogen-devel

Reply via email to