diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
| commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
| tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/surfaces/mackie/mackie_control_protocol.h | |
| parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) | |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.h')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 9172716fe2..68e918d0e9 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -219,7 +219,7 @@ class MackieControlProtocol void update_global_led (int id, Mackie::LedState); ARDOUR::Session & get_session() { return *session; } - framepos_t transport_frame() const; + samplepos_t transport_sample() const; int modifier_state() const { return _modifier_state; } int main_modifier_state() const { return _modifier_state & MAIN_MODIFIER_MASK; } @@ -269,8 +269,8 @@ class MackieControlProtocol // also called from poll_automation to update timecode display void update_timecode_display(); - std::string format_bbt_timecode (ARDOUR::framepos_t now_frame); - std::string format_timecode_timecode (ARDOUR::framepos_t now_frame); + std::string format_bbt_timecode (ARDOUR::samplepos_t now_sample); + std::string format_timecode_timecode (ARDOUR::samplepos_t now_sample); void do_request (MackieControlUIRequest*); int stop (); @@ -313,7 +313,7 @@ class MackieControlProtocol Mackie::Timer _frm_left_last; // last written timecode string std::string _timecode_last; - framepos_t _frame_last; + samplepos_t _sample_last; // Which timecode are we displaying? BBT or Timecode ARDOUR::AnyTime::Type _timecode_type; // Bundle to represent our input ports |