diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-10 03:54:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-10 03:54:00 +0000 |
| commit | a157537898eccf08009281633b19970515366a78 (patch) | |
| tree | cd6f7bb1e7f9bddba1b5cc4ce6e10c60cb2b2a46 /libs/surfaces/tranzport/tranzport_control_protocol.h | |
| parent | 7e8a98224578e03e17fbf5e656241ff5ef1a0bc1 (diff) | |
a) moved metering and meter falloff code into libardour
b) added initial "big meter" mode for tranzport
c) fixed some lock issues in ARDOUR::IO objects
d) generic_midi control surface module now compiles and loads
git-svn-id: svn://localhost/trunk/ardour2@450 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/tranzport/tranzport_control_protocol.h')
| -rw-r--r-- | libs/surfaces/tranzport/tranzport_control_protocol.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h index c5aa5f90e0..d460a6c74a 100644 --- a/libs/surfaces/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/tranzport/tranzport_control_protocol.h @@ -77,6 +77,11 @@ class TranzportControlProtocol : public ControlProtocol { WheelScrub, WheelShuttle }; + + enum DisplayMode { + DisplayNormal, + DisplayBigMeter + }; pthread_t thread; uint32_t buttonmask; @@ -92,6 +97,8 @@ class TranzportControlProtocol : public ControlProtocol { WheelShiftMode wheel_shift_mode; struct timeval last_wheel_motion; int last_wheel_dir; + DisplayMode display_mode; + DisplayMode requested_display_mode; std::vector<sigc::connection> track_connections; @@ -103,6 +110,7 @@ class TranzportControlProtocol : public ControlProtocol { jack_nframes_t last_where; PBD::Lock write_lock; + PBD::Lock print_lock; int open (); int read (uint32_t timeout_override = 0); @@ -112,16 +120,21 @@ class TranzportControlProtocol : public ControlProtocol { int open_core (struct usb_device*); void lcd_clear (); - int lcd_write (int row, int col, uint8_t cell, const char *text); void print (int row, int col, const char* text); int light_on (LightID); int light_off (LightID); + void lights_off (); + + void enter_big_meter_mode (); + void enter_normal_display_mode (); + void next_display_mode (); void show_current_track (); void show_transport_time (); void show_wheel_mode (); void show_gain (); void show_pan (); + void show_meter (); void track_solo_changed (void*); void track_rec_changed (void*); |