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/mcp_buttons.cc | |
| 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/mcp_buttons.cc')
| -rw-r--r-- | libs/surfaces/mackie/mcp_buttons.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index a8998f960d..a4ab7d9099 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -457,9 +457,9 @@ MackieControlProtocol::marker_release (Button &) * the current position and we're not rolling. */ - framepos_t where = session->audible_frame(); + samplepos_t where = session->audible_sample(); - if (session->transport_stopped() && session->locations()->mark_at (where, session->frame_rate() / 100.0)) { + if (session->transport_stopped() && session->locations()->mark_at (where, session->sample_rate() / 100.0)) { return off; } @@ -840,7 +840,7 @@ MackieControlProtocol::master_fader_touch_press (Mackie::Button &) boost::shared_ptr<AutomationControl> ac = master_fader->control (); master_fader->set_in_use (true); - master_fader->start_touch (transport_frame()); + master_fader->start_touch (transport_sample()); return none; } @@ -852,7 +852,7 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &) Fader* master_fader = _master_surface->master_fader(); master_fader->set_in_use (false); - master_fader->stop_touch (transport_frame()); + master_fader->stop_touch (transport_sample()); return none; } |