Preference Dropdown to limit Automatable Parameters

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index d53c61432ebcc0f06e04855d563aeb71e18fa6d2..c7860c53cb5f5e89179ea8cc96980cc4dbae5731 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -70,6 +70,7 @@ AutomationController::AutomationController(boost::shared_ptr<AutomationControl>
        , _controllable(ac)
        , _adjustment(adj)
        , _ignore_change(false)
+       , _grabbed(false)
 {
        if (ac->toggled()) {
                ArdourButton* but = manage(new ArdourButton());
@@ -142,8 +143,8 @@ AutomationController::create(const Evoral::Parameter&             param,
        const double lo        = ac->internal_to_interface(desc.lower);
        const double up        = ac->internal_to_interface(desc.upper);
        const double normal    = ac->internal_to_interface(desc.normal);
-       const double smallstep = ac->internal_to_interface(desc.lower + desc.smallstep);
-       const double largestep = ac->internal_to_interface(desc.lower + desc.largestep);
+       const double smallstep = ac->internal_to_interface(desc.lower + desc.smallstep) - lo;
+       const double largestep = ac->internal_to_interface(desc.lower + desc.largestep) - lo;
 
        Gtk::Adjustment* adjustment = manage (
                new Gtk::Adjustment (normal, lo, up, smallstep, largestep));
@@ -165,6 +166,13 @@ AutomationController::display_effective_value ()
 {
        double const interface_value = _controllable->internal_to_interface(_controllable->get_value());
 
+       if (_grabbed) {
+               /* we cannot use _controllable->touching() here
+                * because that's only set in Write or Touch mode.
+                * Besides ctrl-surfaces may also set touching()
+                */
+               return;
+       }
        if (_adjustment->get_value () != interface_value) {
                _ignore_change = true;
                _adjustment->set_value (interface_value);
@@ -177,7 +185,10 @@ void
 AutomationController::value_adjusted ()
 {
        if (!_ignore_change) {
-               _controllable->set_value (_controllable->interface_to_internal(_adjustment->get_value()), Controllable::NoGroup);
+               const double new_val = _controllable->interface_to_internal(_adjustment->get_value());
+               if (_controllable->user_double() != new_val) {
+                       _controllable->set_value (new_val, Controllable::NoGroup);
+               }
        }
 
        /* A bar controller will automatically follow the adjustment, but for a
@@ -194,13 +205,18 @@ AutomationController::value_adjusted ()
 void
 AutomationController::start_touch()
 {
-       _controllable->start_touch (_controllable->session().transport_frame());
+       _grabbed = true;
+       _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());
+       if (_grabbed) {
+               _grabbed = false;
+               display_effective_value ();
+       }
 }
 
 bool
@@ -258,8 +274,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;