diff options
Diffstat (limited to 'libs/surfaces/frontier/tranzport')
| -rw-r--r-- | libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc | 10 | ||||
| -rw-r--r-- | libs/surfaces/frontier/tranzport/tranzport_control_protocol.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index 5799ab682a..f41703c3de 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -110,7 +110,7 @@ TranzportControlProtocol::TranzportControlProtocol (Session& s) _device_status = STATUS_OFFLINE; udev = 0; current_track_id = 0; - last_where = max_frames; + last_where = max_samples; wheel_mode = WheelTimeline; wheel_shift_mode = WheelShiftGain; wheel_increment = WheelIncrScreen; @@ -555,7 +555,7 @@ TranzportControlProtocol::show_meter () } void -TranzportControlProtocol::show_bbt (framepos_t where) +TranzportControlProtocol::show_bbt (samplepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,8)) { char buf[16]; @@ -591,11 +591,11 @@ TranzportControlProtocol::show_bbt (framepos_t where) void TranzportControlProtocol::show_transport_time () { - show_bbt (session->transport_frame ()); + show_bbt (session->transport_sample ()); } void -TranzportControlProtocol::show_smpte (framepos_t where) +TranzportControlProtocol::show_smpte (samplepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,10)) { @@ -617,7 +617,7 @@ TranzportControlProtocol::show_smpte (framepos_t where) sprintf (buf, "%02" PRIu32 ":", smpte.seconds); print (1, 15, buf); - sprintf (buf, "%02" PRIu32, smpte.frames); + sprintf (buf, "%02" PRIu32, smpte.samples); print_noretry (1, 18, buf); last_where = where; diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h index 13df6915a2..e132361397 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h @@ -150,8 +150,8 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol uint32_t last_hrs; uint32_t last_mins; uint32_t last_secs; - uint32_t last_frames; - framepos_t last_where; + uint32_t last_samples; + samplepos_t last_where; ARDOUR::gain_t last_track_gain; uint32_t last_meter_fill; uint64_t last_wheel_motion; @@ -246,8 +246,8 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol void show_current_track (); void show_track_gain (); void show_transport_time (); - void show_bbt (framepos_t where); - void show_smpte (framepos_t where); + void show_bbt (samplepos_t where); + void show_smpte (samplepos_t where); void show_wheel_mode (); void show_gain (); void show_pan (); |