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

[ardour.git] / gtk2_ardour / vca_master_strip.h

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 5a1ad74b7524936d7713bec77cfe0b89621dff73..d00232a7983c429057b671b82ed8903ab6f0a825 100644 (file)
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -22,12 +22,16 @@
 #include <boost/shared_ptr.hpp>
 
 #include <gtkmm/box.h>
+#include <gtkmm/colorselection.h>
 #include <gtkmm/menuitem.h>
+#include <gtkmm/messagedialog.h>
+
+#include "widgets/ardour_button.h"
 
-#include "ardour_button.h"
 #include "axis_view.h"
 #include "control_slave_ui.h"
 #include "gain_meter.h"
+#include "stripable_colorpicker.h"
 
 namespace ARDOUR {
        class GainControl;
@@ -38,7 +42,7 @@ class FloatingTextEntry;
 
 class VCAMasterStrip : public AxisView, public Gtk::EventBox
 {
-      public:
+public:
        VCAMasterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::VCA>);
        ~VCAMasterStrip ();
 
@@ -55,29 +59,29 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        bool marked_for_display () const;
        bool set_marked_for_display (bool);
 
-     private:
+private:
        boost::shared_ptr<ARDOUR::VCA> _vca;
        GainMeter    gain_meter;
 
-       Gtk::Frame   global_frame;
-       Gtk::VBox    global_vpacker;
-       Gtk::HBox    top_padding;
-       Gtk::HBox    bottom_padding;
-       Gtk::HBox    solo_mute_box;
-       ArdourButton width_button;
-       ArdourButton color_button;
-       ArdourButton hide_button;
-       ArdourButton number_label;
-       ArdourButton solo_button;
-       ArdourButton mute_button;
-       Gtk::Menu*   context_menu;
-       Gtk::MessageDialog* delete_dialog;
-       ArdourButton vertical_button;
-       ControlSlaveUI control_slave_ui;
-       PBD::ScopedConnectionList vca_connections;
+       Gtk::Frame                  global_frame;
+       Gtk::VBox                   global_vpacker;
+       Gtk::HBox                   top_padding;
+       Gtk::HBox                   bottom_padding;
+       Gtk::HBox                   solo_mute_box;
+       ArdourWidgets::ArdourButton width_button;
+       ArdourWidgets::ArdourButton color_button;
+       ArdourWidgets::ArdourButton hide_button;
+       ArdourWidgets::ArdourButton number_label;
+       ArdourWidgets::ArdourButton solo_button;
+       ArdourWidgets::ArdourButton mute_button;
+       Gtk::Menu*                  context_menu;
+       Gtk::MessageDialog*         delete_dialog;
+       ArdourWidgets::ArdourButton vertical_button;
+       ControlSlaveUI              control_slave_ui;
+       PBD::ScopedConnectionList   vca_connections;
 
        void spill ();
-       void spill_change (boost::shared_ptr<ARDOUR::VCA>);
+       void spill_change (boost::shared_ptr<ARDOUR::Stripable>);
        void hide_clicked();
        bool width_button_pressed (GdkEventButton *);
        void set_selected (bool);
@@ -91,6 +95,7 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        void start_name_edit ();
        void finish_name_edit (std::string, int);
        bool vertical_button_press (GdkEventButton*);
+       bool number_button_press (GdkEventButton*);
        void vca_property_changed (PBD::PropertyChange const & what_changed);
        void update_vca_name ();
        void build_context_menu ();
@@ -98,13 +103,15 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        void self_delete ();
        void remove ();
        void drop_all_slaves ();
+       void assign_all_selected ();
+       void unassign_all_selected ();
 
        void parameter_changed (std::string const& p);
        void set_button_names ();
        void update_bottom_padding ();
 
        void start_color_edit ();
-       void finish_color_edit (int, Gtk::ColorSelectionDialog*);
+       StripableColorDialog _color_picker;
 };