Updated tranzport to use Glib::Mutex. Up'd libpbd to version 4.0.0.

git-svn-id: svn://localhost/ardour2/trunk@573 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/pbd3/SConscript b/libs/pbd3/SConscript
index ca216759c4bab717cc6aeaefdb6baef7f1cc3edd..4e64f12d43fa4348643a48cdbb1b239d9bdfc057 100644 (file)
--- a/libs/pbd3/SConscript
+++ b/libs/pbd3/SConscript
@@ -10,7 +10,7 @@ pbd3 = env.Copy()
 
 domain = 'libpbd'
 
-pbd3.Append(DOMAIN=domain,MAJOR=3,MINOR=2,MICRO=0)
+pbd3.Append(DOMAIN=domain,MAJOR=4,MINOR=0,MICRO=0)
 pbd3.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
 pbd3.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 pbd3.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")

diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index bbd6719aef88c6c28cdbe4dedcdfce744003bc7b..8f3568aa8f05642419b385d8bb3bfcb9e1e9f64c 100644 (file)
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -38,7 +38,8 @@ tranzport.Merge ([
     libraries['midi++2'],
     libraries['xml'],
     libraries['usb'],
-    libraries['glib2']
+    libraries['glib2'],
+    libraries['glibmm2']
     ])
 
 libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)

diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
index 0311140f8c20c77c54fe82246d84758833e5f44f..44045f683484df88a3bb867a9445a59b6d99e808 100644 (file)
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -4,10 +4,11 @@
 #include <vector>
 
 #include <sys/time.h>
-#include <pbd/lockmonitor.h>
 #include <pthread.h>
 #include <usb.h>
 
+#include <glibmm/thread.h>
+
 #include <ardour/types.h>
 
 #include "control_protocol.h"
@@ -95,7 +96,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
        DisplayMode     display_mode;
        ARDOUR::gain_t  gain_fraction;
 
-       PBD::Lock update_lock;
+       Glib::Mutex update_lock;
        char current_screen[2][20];
        char pending_screen[2][20];
        bool lights[7];
@@ -112,7 +113,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
        struct timeval last_wheel_motion;
        int            last_wheel_dir;
 
-       PBD::Lock io_lock;
+       Glib::Mutex io_lock;
 
        int open ();
        int read (uint32_t timeout_override = 0);