many changes associated with rationalizing selection flow

[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 8c31f2b1c74131e01d05358e0d125c7da4f456f1..ea8ee52f6d4a95480cd0026199dc8c3cba1c8929 100644 (file)
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -26,6 +26,7 @@
 
 #include "ardour_button.h"
 #include "axis_view.h"
+#include "control_slave_ui.h"
 #include "gain_meter.h"
 
 namespace ARDOUR {
@@ -41,12 +42,19 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        VCAMasterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::VCA>);
        ~VCAMasterStrip ();
 
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const;
+       ARDOUR::PresentationInfo const & presentation_info () const;
+
        std::string name() const;
-       std::string state_id() const { return "VCAMasterStrip"; }
+       Gdk::Color color () const;
+       std::string state_id() const;
        boost::shared_ptr<ARDOUR::VCA> vca() const { return _vca; }
 
        static PBD::Signal1<void,VCAMasterStrip*> CatchDeletion;
 
+       bool marked_for_display () const;
+       bool set_marked_for_display (bool);
+
      private:
        boost::shared_ptr<ARDOUR::VCA> _vca;
        GainMeter    gain_meter;
@@ -55,7 +63,6 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        Gtk::VBox    global_vpacker;
        Gtk::HBox    top_padding;
        Gtk::HBox    bottom_padding;
-       Gtk::HBox    width_hide_box;
        Gtk::HBox    solo_mute_box;
        ArdourButton width_button;
        ArdourButton color_button;
@@ -63,12 +70,12 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        ArdourButton number_label;
        ArdourButton solo_button;
        ArdourButton mute_button;
-       ArdourButton assign_button;
        ArdourButton drop_button;
        Gtk::Menu*   context_menu;
-       PBD::ScopedConnectionList vca_connections;
        Gtk::MessageDialog* delete_dialog;
        ArdourButton vertical_button;
+       ControlSlaveUI control_slave_ui;
+       PBD::ScopedConnectionList vca_connections;
 
        void spill ();
        void spill_change (boost::shared_ptr<ARDOUR::VCA>);
@@ -81,12 +88,9 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
        void set_solo_text ();
        void solo_changed ();
        void mute_changed ();
-       void vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n);
        void unassign ();
-       bool vca_button_release (GdkEventButton*);
-       void update_vca_display ();
        void start_name_edit ();
-       void finish_name_edit (std::string);
+       void finish_name_edit (std::string, int);
        bool vertical_button_press (GdkEventButton*);
        void vca_property_changed (PBD::PropertyChange const & what_changed);
        void update_vca_name ();
@@ -99,6 +103,9 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 
        void parameter_changed (std::string const& p);
        void set_button_names ();
+
+       void start_color_edit ();
+       void finish_color_edit (int, Gtk::ColorSelectionDialog*);
 };