Oops - the previous namespace qualifier was also needed in gtk2_ardour/processor_box.cc

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 91009bf487e5bec84150fa94e619c7efc0dc3c78..a80a4742327cf41eadd782287b83b0af455c9af9 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -23,12 +23,8 @@
 
 #include "pbd/error.h"
 
-#include "ardour/automation_list.h"
-#include "ardour/automation_control.h"
-#include "ardour/event_type_map.h"
 #include "ardour/automatable.h"
-#include "ardour/panner.h"
-#include "ardour/pan_controllable.h"
+#include "ardour/automation_control.h"
 #include "ardour/session.h"
 
 #include "ardour_ui.h"
@@ -76,9 +72,15 @@ AutomationController::create(
                const Evoral::Parameter& param,
                boost::shared_ptr<AutomationControl> ac)
 {
-       Gtk::Adjustment* adjustment = manage (new Gtk::Adjustment (param.normal(), param.min(), param.max(),
-                                                                  (param.max() - param.min())/100.0,
-                                                                  (param.max() - param.min())/10.0));
+       Gtk::Adjustment* adjustment = manage (
+               new Gtk::Adjustment (
+                       ac->internal_to_interface (param.normal()),
+                       ac->internal_to_interface (param.min()),
+                       ac->internal_to_interface (param.max()),
+                       (param.max() - param.min()) / 100.0,
+                       (param.max() - param.min()) / 10.0
+                       )
+               );
 
         assert (ac);
         assert(ac->parameter() == param);
@@ -135,23 +137,6 @@ AutomationController::end_touch ()
        }
 }
 
-void
-AutomationController::automation_state_changed ()
-{
-       ENSURE_GUI_THREAD (*this, &AutomationController::automation_state_changed)
-
-       bool x = (_controllable->automation_state() != Off);
-
-       /* start watching automation so that things move */
-
-       _screen_update_connection.disconnect();
-
-       if (x) {
-               _screen_update_connection = ARDOUR_UI::RapidScreenUpdate.connect (
-                               sigc::mem_fun (*this, &AutomationController::display_effective_value));
-       }
-}
-
 void
 AutomationController::value_changed ()
 {