diff options
Diffstat (limited to 'libs/surfaces/mackie')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 8 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 4 |
2 files changed, 6 insertions, 6 deletions
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. |