smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

pulling trunk

Browse source 
git-svn-id: svn://localhost/ardour2/branches/undo@586 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Fugal 2006-06-14 18:37:57 +00:00
parent 3038d8ce4a
commit eb3f77df57
237 changed files with 68673 additions and 4051 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/surfaces/control_protocol/SConscript
View file

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

4
libs/surfaces/generic_midi/SConscript
View file

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

4
libs/surfaces/tranzport/SConscript
View file

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

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