add new clear-gray color theme

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index d2e2236941a62db75cb13635251626aff12d9f1a..c1c1726902aa1bf5e34e6a07072fcdd6c4bd191e 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -48,6 +48,7 @@
 #include "pbd/fastlog.h"
 
 #include "axis_view.h"
+#include "control_slave_ui.h"
 #include "ardour_knob.h"
 #include "route_ui.h"
 #include "gain_meter.h"
@@ -87,6 +88,8 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        bool marked_for_display () const;
        bool set_marked_for_display (bool);
 
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
+
        void set_width_enum (Width, void* owner);
        Width get_width_enum () const { return _width; }
        void* width_owner () const { return _width_owner; }
@@ -137,11 +140,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        void toggle_processors ();
        void ab_plugins ();
 
-       void vca_assign (boost::shared_ptr<ARDOUR::VCA>);
-       void vca_unassign (boost::shared_ptr<ARDOUR::VCA>);
-
-       void set_selected(bool yn);
-       bool is_selected() {return _selected;}
+       void set_selected (bool yn);
 
        static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
 
@@ -198,6 +197,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
 
        void input_button_resized (Gtk::Allocation&);
        void output_button_resized (Gtk::Allocation&);
+       void comment_button_resized (Gtk::Allocation&);
 
        ArdourButton* midi_input_enable_button;
        Gtk::HBox   input_button_box;
@@ -275,7 +275,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        void route_color_changed ();
        void show_passthru_color ();
 
-       void property_changed (const PBD::PropertyChange&);
+       void route_property_changed (const PBD::PropertyChange&);
        void name_button_resized (Gtk::Allocation&);
        void name_changed ();
        void update_speed_display ();
@@ -331,10 +331,9 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
 
        std::string meter_point_string (ARDOUR::MeterPoint);
 
-       void vca_menu_toggle (Gtk::CheckMenuItem*, uint32_t n);
-       bool vca_button_release (GdkEventButton* ev);
-
        void update_track_number_visibility ();
+
+       ControlSlaveUI control_slave_ui;
 };
 
 #endif /* __ardour_mixer_strip__ */