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 46f5abd82f3e18929d633bfa88c44b24077df6af..e40c38ff40778dc7eee3fc431c87587afd7df91d 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -47,6 +47,9 @@
 
 #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"
 #include "panner_ui.h"
@@ -73,13 +76,20 @@ class MotionController;
 class RouteGroupMenu;
 class ArdourWindow;
 
-class MixerStrip : public RouteUI, public Gtk::EventBox
+class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
 {
   public:
        MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
        MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true);
        ~MixerStrip ();
 
+       std::string name()  const;
+       Gdk::Color color () const;
+       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; }
@@ -130,8 +140,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void toggle_processors ();
        void ab_plugins ();
 
-       void set_selected(bool yn);
-       bool is_selected() {return _selected;}
+       void set_selected (bool yn);
 
        static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
 
@@ -157,7 +166,7 @@ class MixerStrip : 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 *);
@@ -176,15 +185,20 @@ class MixerStrip : 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 ();
 
        ArdourButton input_button;
        ArdourButton output_button;
 
+       ArdourButton* monitor_section_button;
+
        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;
@@ -195,6 +209,9 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        bool input_active_button_press (GdkEventButton*);
        bool input_active_button_release (GdkEventButton*);
 
+       void help_count_plugins (boost::weak_ptr<ARDOUR::Processor>);
+       uint32_t _plugin_insert_cnt;
+
        gint    mark_update_safe ();
        guint32 mode_switch_in_progress;
 
@@ -202,6 +219,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        ArdourButton   _comment_button;
 
+       ArdourKnob     trim_control;
+
        void setup_comment_button ();
 
        ArdourButton   group_button;
@@ -231,13 +250,11 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::MenuItem* rename_menu_item;
        void build_send_action_menu ();
 
-       void new_send ();
-       void show_send_controls ();
-
        PBD::ScopedConnection panstate_connection;
        PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
        void update_panner_choices ();
+       void update_trim_control ();
 
        void update_diskstream_display ();
        void update_input_display ();
@@ -248,7 +265,6 @@ class MixerStrip : 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 ();
 
@@ -260,7 +276,7 @@ class MixerStrip : 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 ();
@@ -315,6 +331,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        PBD::ScopedConnection _level_meter_connection;
 
        std::string meter_point_string (ARDOUR::MeterPoint);
+
+       void update_track_number_visibility ();
+
+       ControlSlaveUI control_slave_ui;
 };
 
 #endif /* __ardour_mixer_strip__ */