Changeset 1553

Timestamp:

02/08/10 01:15:13 (3 years ago)

Author:

wolke

Message:

merge rev. 1512:1552 from trunk

Location:

branches/undo

Files:

• . (modified) (1 prop)
• Sconstruct (modified) (1 diff)
• data/img/gray/preferencesDialog (modified) (1 prop)
• libs/hydrogen/src/IO/portmidi_driver.cpp (modified) (2 diffs)

branches/undo/Sconstruct

@@ -278 +278 @@
         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')

branches/undo/libs/hydrogen/src/IO/portmidi_driver.cpp

@@ -36 +36 @@
 
 #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 */
 
@@ -52 +52 @@
 
         PmError status;
-        PmError length;
+        int length;
         PmEvent buffer[1];
         while ( instance->m_bRunning ) {