projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSC: Changed gainVCA to gainfader as VCA is already used.
[ardour.git]
/
libs
/
surfaces
/
tranzport
/
tranzport_control_protocol.h
diff --git
a/libs/surfaces/tranzport/tranzport_control_protocol.h
b/libs/surfaces/tranzport/tranzport_control_protocol.h
index 1c318007b081f2f6610cbfc777c790c6eacab714..32d88aaf5e9a431b75f424ea38bf92f24367f6ca 100644
(file)
--- a/
libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/
libs/surfaces/tranzport/tranzport_control_protocol.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2006 Paul Davis
+ Copyright (C) 2006 Paul Davis
Copyright (C) 2007 Mike Taht
This program is free software; you can redistribute it and/or modify
Copyright (C) 2007 Mike Taht
This program is free software; you can redistribute it and/or modify
@@
-59,7
+59,7
@@
private:
const static int STATUS_OFFLINE = 0xff;
const static int STATUS_ONLINE = 0x01;
const static int STATUS_OK = 0x00;
const static int STATUS_OFFLINE = 0xff;
const static int STATUS_ONLINE = 0x01;
const static int STATUS_OK = 0x00;
-
+
const static int LIGHTS = 7;
const static int ROWS = 2;
const static int COLUMNS = 20;
const static int LIGHTS = 7;
const static int ROWS = 2;
const static int COLUMNS = 20;
@@
-97,7
+97,7
@@
private:
ButtonPlay = 0x00100000,
ButtonRecord = 0x00000100,
ButtonShift = 0x08000000,
ButtonPlay = 0x00100000,
ButtonRecord = 0x00000100,
ButtonShift = 0x08000000,
- ButtonFootswitch = 0x00001000
+ ButtonFootswitch = 0x00001000
};
enum WheelShiftMode {
};
enum WheelShiftMode {
@@
-106,7
+106,7
@@
private:
WheelShiftMaster,
WheelShiftMarker
};
WheelShiftMaster,
WheelShiftMarker
};
-
+
enum WheelMode {
WheelTimeline,
WheelScrub,
enum WheelMode {
WheelTimeline,
WheelScrub,
@@
-124,7
+124,7
@@
private:
WheelIncrSecond,
WheelIncrMinute
};
WheelIncrSecond,
WheelIncrMinute
};
-
+
enum DisplayMode {
DisplayNormal,
DisplayRecording,
enum DisplayMode {
DisplayNormal,
DisplayRecording,
@@
-183,7
+183,7
@@
private:
std::bitset<LIGHTS> lights_flash;
int32_t last_notify;
std::bitset<LIGHTS> lights_flash;
int32_t last_notify;
- char last_notify_msg[COLUMNS+1];
+ char last_notify_msg[COLUMNS+1];
uint32_t last_bars;
uint32_t last_beats;
uint32_t last_ticks;
uint32_t last_bars;
uint32_t last_beats;
uint32_t last_ticks;
@@
-241,10
+241,10
@@
private:
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 -
int screen_show_bling();
int screen_show_bling();
- // Commands to write to the lcd
+ // Commands to write to the lcd
int lcd_init();
bool lcd_damage();
int lcd_init();
bool lcd_damage();
@@
-293,7
+293,7
@@
private:
void enter_bling_mode();
void next_marker (); // basicui doesn't give me enough info
void enter_bling_mode();
void next_marker (); // basicui doesn't give me enough info
- void prev_marker ();
+ void prev_marker ();
void next_display_mode ();
void normal_update ();
void next_display_mode ();
void normal_update ();
@@
-301,7
+301,7
@@
private:
void show_current_track ();
void show_track_gain ();
void show_transport_time ();
void show_current_track ();
void show_track_gain ();
void show_transport_time ();
- void show_bbt (framepos_t where);
+ void show_bbt (framepos_t where);
void show_timecode (framepos_t where);
void show_wheel_mode ();
void show_gain ();
void show_timecode (framepos_t where);
void show_wheel_mode ();
void show_gain ();