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

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index d53c61432ebcc0f06e04855d563aeb71e18fa6d2..ac4fcc253ec18c58c0b66457accc5daca7e9696f 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -194,13 +194,13 @@ AutomationController::value_adjusted ()
 void
 AutomationController::start_touch()
 {
-       _controllable->start_touch (_controllable->session().transport_frame());
+       _controllable->start_touch (_controllable->session().transport_sample());
 }
 
 void
 AutomationController::end_touch ()
 {
-       _controllable->stop_touch (_controllable->session().transport_frame());
+       _controllable->stop_touch (_controllable->session().transport_sample());
 }
 
 bool
@@ -258,8 +258,8 @@ AutomationController::set_freq_beats(double beats)
 {
        const ARDOUR::ParameterDescriptor& desc    = _controllable->desc();
        const ARDOUR::Session&             session = _controllable->session();
-       const framepos_t                   pos     = session.transport_frame();
-       const ARDOUR::Tempo&               tempo   = session.tempo_map().tempo_at_frame (pos);
+       const samplepos_t                   pos     = session.transport_sample();
+       const ARDOUR::Tempo&               tempo   = session.tempo_map().tempo_at_sample (pos);
        const double                       bpm     = tempo.note_types_per_minute();
        const double                       bps     = bpm / 60.0;
        const double                       freq    = bps / beats;