globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / libs / surfaces / mackie / mcp_buttons.cc

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index a8998f960d440967b46b071c6233e1d979c7b9be..a4ab7d9099d8371e42133a626dbde33901fbaf2b 100644 (file)
--- 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;
 }