Fix yet another oversight for the windows icon file update

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index f1ff2bb35fa1e398d8941bec8766112c809e7336..e40c38ff40778dc7eee3fc431c87587afd7df91d 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; }
 
@@ -167,7 +166,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        ArdourButton         width_button;
        ArdourButton         number_label;
        Gtk::HBox           width_hide_box;
-       Gtk::EventBox*      spacer;
+       Gtk::EventBox           spacer;
 
        void hide_clicked();
        bool width_button_pressed (GdkEventButton *);
@@ -186,7 +185,8 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        Gtk::Table mute_solo_table;
        Gtk::Table bottom_button_table;
 
-       ArdourButton                 meter_point_button;
+       void vca_assign (boost::shared_ptr<ARDOUR::VCA>);
+       void vca_unassign (boost::shared_ptr<ARDOUR::VCA>);
 
        void meter_changed ();
        void monitor_changed ();
@@ -198,6 +198,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;
@@ -253,6 +254,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
        void update_panner_choices ();
+       void update_trim_control ();
 
        void update_diskstream_display ();
        void update_input_display ();
@@ -263,7 +265,6 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        Gtk::Menu* route_ops_menu;
        void build_route_ops_menu ();
        gboolean name_button_button_press (GdkEventButton*);
-       gboolean name_button_button_release (GdkEventButton*);
        gboolean number_button_button_press (GdkEventButton*);
        void list_route_operations ();
 
@@ -331,10 +332,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__ */