X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=6ffb1ad907257346683a5266e136ecd2d5a5af98;hb=b461bc1dc1970a9e147c43a721d3155f6215f8c7;hp=e76f8170eeb0cb2f90e540555f0af723c2c34ab9;hpb=8f7f17187770afc8352dad61ca48ff304c734f68;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index e76f8170ee..6ffb1ad907 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -34,9 +34,9 @@
 #include <gtkmm/textview.h>
 #include <gtkmm/adjustment.h>
 
-#include <gtkmm2ext/auto_spin.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/slider_controller.h>
+#include "gtkmm2ext/auto_spin.h"
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/bindable_button.h"
 
 #include "pbd/stateful.h"
 
@@ -53,10 +53,6 @@
 #include "processor_box.h"
 #include "ardour_dialog.h"
 
-namespace Gtkmm2ext {
-	class SliderController;
-}
-
 namespace ARDOUR {
 	class Route;
 	class Send;
@@ -79,8 +75,8 @@ class RouteGroupMenu;
 class MixerStrip : 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 (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
+	MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true);
 	~MixerStrip ();
 
 	void set_width_enum (Width, void* owner);
@@ -98,10 +94,28 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void set_route (boost::shared_ptr<ARDOUR::Route>);
 	void set_button_names ();
 	void show_send (boost::shared_ptr<ARDOUR::Send>);
+	void revert_to_default_display ();
+
+	/** @return the delivery that is being edited using our fader; it will be the
+	 *  last send passed to ::show_send, or our route's main out delivery.
+	 */
+	boost::shared_ptr<ARDOUR::Delivery> current_delivery () const {
+		return _current_delivery;
+	}
+
+	bool mixer_owned () const {
+		return _mixer_owned;
+	}
+
+	void hide_things ();
+
+	sigc::signal<void> WidthChanged;
 
-	sigc::signal<void>      WidthChanged;
+	/** The delivery that we are handling the level for with our fader has changed */
+	PBD::Signal1<void, boost::weak_ptr<ARDOUR::Delivery> > DeliveryChanged;
 
 	static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
+	static PBD::Signal1<void,MixerStrip*> CatchDeletion;
 
   protected:
 	friend class Mixer_UI;
@@ -144,18 +158,22 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	ProcessorBox processor_box;
 	GainMeter   gpm;
 	PannerUI    panners;
-	Gtk::ToggleButton _mono_button;
 
 	Gtk::Table button_table;
+        Gtk::Table solo_led_table;
+	Gtk::HBox  below_panner_box;
 	Gtk::Table middle_button_table;
 	Gtk::Table bottom_button_table;
 
+	Gtk::Label* _iso_label;
+	Gtk::Label* _safe_label;
+
 	Gtk::Button                  gain_unit_button;
 	Gtk::Label                   gain_unit_label;
 	Gtk::Button                  meter_point_button;
 	Gtk::Label                   meter_point_label;
 
-	void meter_changed (void *);
+	void meter_changed ();
 
 	Gtk::Button diskstream_button;
 	Gtk::Label  diskstream_label;
@@ -165,7 +183,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Gtk::Button output_button;
 	Gtk::Label  output_label;
 
-	sigc::connection newplug_connection;
+	std::string longest_label;
 
 	gint    mark_update_safe ();
 	guint32 mode_switch_in_progress;
@@ -174,12 +192,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	ArdourDialog*  comment_window;
 	Gtk::TextView* comment_area;
-	Gtk::Button    comment_button;
 
-	void comment_editor_done_editing();
+	void comment_editor_done_editing ();
 	void setup_comment_editor ();
-	void comment_button_clicked ();
-	void mono_button_clicked ();
+	void toggle_comment ();
 
 	Gtk::Button   group_button;
 	Gtk::Label    group_label;
@@ -205,17 +221,15 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void diskstream_changed ();
 
 	Gtk::Menu *send_action_menu;
+	Gtk::CheckMenuItem* _comment_menu_item;
 	Gtk::MenuItem* rename_menu_item;
 	void build_send_action_menu ();
 
 	void new_send ();
 	void show_send_controls ();
 
-	void input_changed (ARDOUR::IOChange, void *);
-	void output_changed (ARDOUR::IOChange, void *);
-
-	sigc::connection panstate_connection;
-	sigc::connection panstyle_connection;
+	PBD::ScopedConnection panstate_connection;
+	PBD::ScopedConnection panstyle_connection;
 	void connect_to_pan ();
 
 	void update_diskstream_display ();
@@ -226,7 +240,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	Gtk::Menu* route_ops_menu;
 	void build_route_ops_menu ();
-	gint name_button_button_press (GdkEventButton*);
+	gboolean name_button_button_press (GdkEventButton*);
 	void list_route_operations ();
 
 	gint comment_key_release_handler (GdkEventKey*);
@@ -236,7 +250,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	void set_route_group (ARDOUR::RouteGroup *);
 	bool select_route_group (GdkEventButton *);
-	void route_group_changed (void *);
+	void route_group_changed ();
 
 	IOSelectorWindow *input_selector;
 	IOSelectorWindow *output_selector;
@@ -261,15 +275,21 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void engine_stopped();
 
 	void switch_io (boost::shared_ptr<ARDOUR::Route>);
+	
+	void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
 	boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
-	void revert_to_default_display ();
-
+	
 	void drop_send ();
-	sigc::connection send_gone_connection;
+	PBD::ScopedConnection send_gone_connection;
+
+	void reset_strip_style ();
 
 	static int scrollbar_height;
 
 	void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
+	void port_connected_or_disconnected (ARDOUR::Port *, ARDOUR::Port *);
+
+        static std::string meter_point_string (ARDOUR::MeterPoint);
 };
 
 #endif /* __ardour_mixer_strip__ */