diff options
| author | Hans Fugal <hans@fugal.net> | 2006-06-14 18:37:57 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-06-14 18:37:57 +0000 |
| commit | eb3f77df5748e81c4a6bfe737cd9b5a3d721a86c (patch) | |
| tree | dc94ebf33ca8debe5a67950d86b23162f56e7c07 /libs/surfaces | |
| parent | 3038d8ce4aa0627847bdcbd8140447fb306ef7fb (diff) | |
pulling trunk
git-svn-id: svn://localhost/ardour2/branches/undo@586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/control_protocol/SConscript | 4 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/SConscript | 4 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 4 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/tranzport_control_protocol.h | 7 |
4 files changed, 13 insertions, 6 deletions
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index eeac7bed8b..38ff95d9f0 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -36,7 +36,9 @@ cp.Merge ([ libraries['pbd3'], libraries['midi++2'], libraries['xml'], - libraries['usb'] + libraries['usb'], + libraries['glib2'], + libraries['glibmm2'] ]) libardour_cp = cp.SharedLibrary('ardour_cp', cp_files) diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index 97998f864f..1760eb24e9 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -37,7 +37,9 @@ genericmidi.Merge ([ libraries['pbd3'], libraries['sigc2'], libraries['usb'], - libraries['xml'] + libraries['xml'], + libraries['glib2'], + libraries['glibmm2'] ]) libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files) diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index 55dae57cc1..8f3568aa8f 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -37,7 +37,9 @@ tranzport.Merge ([ libraries['pbd3'], libraries['midi++2'], libraries['xml'], - libraries['usb'] + libraries['usb'], + 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); |