diff options
Diffstat (limited to 'libs/surfaces')
6 files changed, 18 insertions, 20 deletions
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index 1924a4df94..f6a8f4d4b7 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -555,7 +555,7 @@ TranzportControlProtocol::show_meter () } void -TranzportControlProtocol::show_bbt (nframes_t where) +TranzportControlProtocol::show_bbt (framepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,8)) { char buf[16]; @@ -591,12 +591,11 @@ TranzportControlProtocol::show_bbt (nframes_t where) void TranzportControlProtocol::show_transport_time () { - nframes_t where = session->transport_frame(); - show_bbt(where); + show_bbt (session->transport_frame ()); } void -TranzportControlProtocol::show_smpte (nframes_t where) +TranzportControlProtocol::show_smpte (framepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,10)) { diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h index 4e37da9916..0c7f600e2c 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h @@ -151,7 +151,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol uint32_t last_mins; uint32_t last_secs; uint32_t last_frames; - nframes_t last_where; + framepos_t last_where; ARDOUR::gain_t last_track_gain; uint32_t last_meter_fill; struct timeval 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 (nframes_t where); - void show_smpte (nframes_t where); + void show_bbt (framepos_t where); + void show_smpte (framepos_t where); void show_wheel_mode (); void show_gain (); void show_pan (); diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 44e6b28d78..25b5679c45 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1048,7 +1048,7 @@ MackieControlProtocol::update_automation (RouteSignal & rs) } string -MackieControlProtocol::format_bbt_timecode (nframes_t now_frame) +MackieControlProtocol::format_bbt_timecode (framepos_t now_frame) { BBT_Time bbt_time; session->bbt_time (now_frame, bbt_time); @@ -1078,7 +1078,7 @@ MackieControlProtocol::format_bbt_timecode (nframes_t now_frame) } string -MackieControlProtocol::format_timecode_timecode (nframes_t now_frame) +MackieControlProtocol::format_timecode_timecode (framepos_t now_frame) { Timecode::Time timecode; session->timecode_time (now_frame, timecode); @@ -1101,7 +1101,7 @@ MackieControlProtocol::update_timecode_display() if (surface().has_timecode_display()) { // do assignment here so current_frame is fixed - nframes_t current_frame = session->transport_frame(); + framepos_t current_frame = session->transport_frame(); string timecode; switch (_timecode_type) @@ -1592,7 +1592,7 @@ MackieControlProtocol::marker_press (Button &) { // cut'n'paste from LocationUI::add_new_location() string markername; - nframes_t where = session->audible_frame(); + framepos_t where = session->audible_frame(); session->locations()->next_available_name(markername,"mcu"); Location *location = new Location (*session, where, where, markername, Location::IsMark); session->begin_reversible_command (_("add marker")); diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 3007df8f5a..458dc86172 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -283,8 +283,8 @@ class MackieControlProtocol // also called from poll_automation to update timecode display void update_timecode_display(); - std::string format_bbt_timecode (ARDOUR::nframes_t now_frame); - std::string format_timecode_timecode (ARDOUR::nframes_t now_frame); + std::string format_bbt_timecode (ARDOUR::framepos_t now_frame); + std::string format_timecode_timecode (ARDOUR::framepos_t now_frame); /** notification that the port is about to start it's init sequence. diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc index cefe5f2dd1..c7eb11216a 100644 --- a/libs/surfaces/tranzport/show.cc +++ b/libs/surfaces/tranzport/show.cc @@ -284,7 +284,7 @@ TranzportControlProtocol::show_meter () } void -TranzportControlProtocol::show_bbt (nframes_t where) +TranzportControlProtocol::show_bbt (framepos_t where) { if (where != last_where) { char buf[16]; @@ -348,12 +348,11 @@ TranzportControlProtocol::show_bbt (nframes_t where) void TranzportControlProtocol::show_transport_time () { - nframes_t where = session->transport_frame(); - show_bbt(where); + show_bbt (session->transport_frame ()); } void -TranzportControlProtocol::show_timecode (nframes_t where) +TranzportControlProtocol::show_timecode (framepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,10)) { diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h index e85234c7a3..53d64e8e98 100644 --- a/libs/surfaces/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/tranzport/tranzport_control_protocol.h @@ -193,7 +193,7 @@ private: uint32_t last_mins; uint32_t last_secs; uint32_t last_frames; - nframes_t last_where; + framepos_t last_where; ARDOUR::gain_t last_track_gain; uint32_t last_meter_fill; struct timeval last_wheel_motion; @@ -301,8 +301,8 @@ private: void show_current_track (); void show_track_gain (); void show_transport_time (); - void show_bbt (nframes_t where); - void show_timecode (nframes_t where); + void show_bbt (framepos_t where); + void show_timecode (framepos_t where); void show_wheel_mode (); void show_gain (); void show_pan (); |