projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
globally remove all trailing whitespace from ardour code base.
[ardour.git]
/
libs
/
surfaces
/
frontier
/
tranzport
/
tranzport_control_protocol.h
diff --git
a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
index 0c7f600e2cbdf08b7b943e6a825d64e591b92e23..39addbbaca808537f039160d867370762782413a 100644
(file)
--- a/
libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
+++ b/
libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
@@
-8,7
+8,7
@@
#include <pthread.h>
#include <usb.h>
#include <pthread.h>
#include <usb.h>
-#include <glibmm/thread.h>
+#include <glibmm/thread
s
.h>
#include "ardour/types.h"
#include "ardour/types.h"
@@
-94,7
+94,7
@@
class TranzportControlProtocol : public ARDOUR::ControlProtocol
WheelIncrSecond,
WheelIncrMinute
};
WheelIncrSecond,
WheelIncrMinute
};
-
+
enum DisplayMode {
DisplayNormal,
DisplayRecording,
enum DisplayMode {
DisplayNormal,
DisplayRecording,
@@
-130,7
+130,7
@@
class TranzportControlProtocol : public ARDOUR::ControlProtocol
ARDOUR::gain_t gain_fraction;
ARDOUR::gain_t gain_fraction;
-
Glib
::Mutex update_lock;
+
Glib::Threads
::Mutex update_lock;
bool screen_invalid[2][20];
char screen_current[2][20];
bool screen_invalid[2][20];
char screen_current[2][20];
@@
-154,7
+154,7
@@
class TranzportControlProtocol : public ARDOUR::ControlProtocol
framepos_t last_where;
ARDOUR::gain_t last_track_gain;
uint32_t last_meter_fill;
framepos_t last_where;
ARDOUR::gain_t last_track_gain;
uint32_t last_meter_fill;
-
struct timeval
last_wheel_motion;
+
uint64_t
last_wheel_motion;
int last_wheel_dir;
Glib::Mutex io_lock;
int last_wheel_dir;
Glib::Mutex io_lock;
@@
-190,9
+190,9
@@
class TranzportControlProtocol : public ARDOUR::ControlProtocol
void screen_invalidate();
int screen_flush();
void screen_clear();
void screen_invalidate();
int screen_flush();
void screen_clear();
- // bool screen_isuptodate(); // think on this -
+ // bool screen_isuptodate(); // think on this -
- // Commands to write to the lcd
+ // Commands to write to the lcd
int lcd_init();
bool lcd_damage();
int lcd_init();
bool lcd_damage();