diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-06-08 03:58:29 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-06-08 03:58:29 +0000 |
| commit | c722a425530916076e187a2685eb8d8a17d666f5 (patch) | |
| tree | b459e02ec0a39bbc843fcc2fcef01141d4a7340a | |
| parent | f03a1dbe0fd39348cf9fb3b62e65914c32720b7c (diff) | |
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
| -rw-r--r-- | libs/pbd3/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 3 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/tranzport_control_protocol.h | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libs/pbd3/SConscript b/libs/pbd3/SConscript index ca216759c4..4e64f12d43 100644 --- 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 bbd6719aef..8f3568aa8f 100644 --- 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 0311140f8c..44045f6834 100644 --- 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); |