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

[ardour.git] / gtk2_ardour / automation_time_axis.h

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index e95199ae15c29e5fdb3575bb7dee0ce43476a625..aae1ec5657317138493a09aec52d7a89ed61f238 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -32,10 +32,11 @@
 
 #include "canvas/rectangle.h"
 
+#include "widgets/ardour_button.h"
+#include "widgets/ardour_dropdown.h"
+
 #include "time_axis_view.h"
 #include "automation_controller.h"
-#include "ardour_button.h"
-#include "ardour_dropdown.h"
 
 namespace ARDOUR {
        class Session;
@@ -154,8 +155,8 @@ protected:
        bool    ignore_toggle;
        bool    first_call_to_set_height;
 
-       ArdourButton       hide_button;
-       ArdourDropdown     auto_dropdown;
+       ArdourWidgets::ArdourButton   hide_button;
+       ArdourWidgets::ArdourDropdown auto_dropdown;
        Gtk::Label*        plugname;
        bool               plugname_packed;
 
@@ -188,6 +189,8 @@ protected:
        bool ignore_state_request;
        bool ignore_mode_request;
 
+       bool propagate_time_selection () const;
+
        void automation_state_changed ();
 
        void set_interpolation (ARDOUR::AutomationList::InterpolationStyle);
@@ -205,6 +208,8 @@ protected:
        static Pango::FontDescription name_font;
        static bool have_name_font;
 
+       std::string automation_state_off_string () const;
+
 private:
        int set_state_2X (const XMLNode &, int);
 };