Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / automation_controller.cc

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 3809dc215f41923758f54a78dc581aeec14104cc..d53c61432ebcc0f06e04855d563aeb71e18fa6d2 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -29,8 +29,8 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 
-#include "ardour_button.h"
-#include "ardour_knob.h"
+#include "widgets/ardour_button.h"
+#include "widgets/ardour_knob.h"
 #include "automation_controller.h"
 #include "gui_thread.h"
 #include "note_select_dialog.h"
@@ -40,14 +40,15 @@
 
 using namespace ARDOUR;
 using namespace Gtk;
+using namespace ArdourWidgets;
 
 using PBD::Controllable;
 
 AutomationBarController::AutomationBarController (
                boost::shared_ptr<AutomationControl> ac,
                Adjustment*                          adj)
-       : Gtkmm2ext::BarController(*adj, ac)
-       , _controllable(ac)
+       : ArdourWidgets::BarController (*adj, ac)
+       , _controllable (ac)
 {
 }
 
@@ -97,6 +98,8 @@ AutomationController::AutomationController(boost::shared_ptr<AutomationControl>
                knob->set_controllable (ac);
                knob->set_name("processor control knob");
                _widget = knob;
+               knob->StartGesture.connect(sigc::mem_fun(*this, &AutomationController::start_touch));
+               knob->StopGesture.connect(sigc::mem_fun(*this, &AutomationController::end_touch));
        } else {
                AutomationBarController* bar = manage(new AutomationBarController(ac, adj));
 
@@ -114,10 +117,13 @@ AutomationController::AutomationController(boost::shared_ptr<AutomationControl>
        _adjustment->signal_value_changed().connect(
                sigc::mem_fun(*this, &AutomationController::value_adjusted));
 
-       _screen_update_connection = Timers::rapid_connect (
-                       sigc::mem_fun (*this, &AutomationController::display_effective_value));
+       ac->Changed.connect (_changed_connections, invalidator (*this), boost::bind (&AutomationController::display_effective_value, this), gui_context());
+       display_effective_value ();
 
-       ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::display_effective_value, this), gui_context());
+       if (ac->alist ()) {
+               ac->alist()->automation_state_changed.connect (_changed_connections, invalidator (*this), boost::bind (&AutomationController::automation_state_changed, this), gui_context());
+               automation_state_changed ();
+       }
 
        add(*_widget);
        show_all();
@@ -148,7 +154,14 @@ AutomationController::create(const Evoral::Parameter&             param,
 }
 
 void
-AutomationController::display_effective_value()
+AutomationController::automation_state_changed ()
+{
+       bool x = _controllable->alist()->automation_state() & Play;
+       _widget->set_sensitive (!x);
+}
+
+void
+AutomationController::display_effective_value ()
 {
        double const interface_value = _controllable->internal_to_interface(_controllable->get_value());
 
@@ -187,20 +200,7 @@ AutomationController::start_touch()
 void
 AutomationController::end_touch ()
 {
-       if (_controllable->automation_state() == Touch) {
-
-               bool mark = false;
-               double when = 0;
-
-               if (_controllable->session().transport_rolling()) {
-                       mark = true;
-                       when = _controllable->session().transport_frame();
-               }
-
-               _controllable->stop_touch (mark, when);
-       } else {
-               _controllable->stop_touch (false, _controllable->session().transport_frame());
-       }
+       _controllable->stop_touch (_controllable->session().transport_frame());
 }
 
 bool
@@ -333,7 +333,6 @@ AutomationController::disable_vertical_scroll ()
        AutomationBarController* bar = dynamic_cast<AutomationBarController*>(_widget);
        if (bar) {
                bar->set_tweaks (
-                       Gtkmm2ext::PixFader::Tweaks(bar->tweaks() |
-                                                   Gtkmm2ext::PixFader::NoVerticalScroll));
+                       ArdourWidgets::ArdourFader::Tweaks(bar->tweaks() | ArdourWidgets::ArdourFader::NoVerticalScroll));
        }
 }