allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@573 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin
2006-06-08 03:58:29 +00:00
parent f03a1dbe0f
commit c722a42553
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/pbd3/SConscript
View File

@@ -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")

3
libs/surfaces/tranzport/SConscript
View File

@@ -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)

7
libs/surfaces/tranzport/tranzport_control_protocol.h
View File

@@ -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);