X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=e40c38ff40778dc7eee3fc431c87587afd7df91d;hb=bd8ab472f58492a67be06e462eb6f1c828f01f59;hp=5f8ce4f45c9dff60b9d936f3bbc1ae0aab6fd3e0;hpb=22cbc69074371e4a1e59acb914b38aa86240a05a;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 5f8ce4f45c..e40c38ff40 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -47,6 +47,8 @@
 
 #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"
@@ -74,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; }
@@ -131,11 +140,7 @@ class MixerStrip : 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; }
 
@@ -161,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 *);
@@ -180,7 +185,8 @@ 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 ();
@@ -192,6 +198,7 @@ class MixerStrip : 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;
@@ -247,6 +254,7 @@ class MixerStrip : 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 ();
@@ -257,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 ();
 
@@ -269,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 ();
@@ -325,10 +332,9 @@ class MixerStrip : 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__ */