X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=bbebbcaf15e0791a6b77604dde42cb64bc64f97b;hb=fef66431656638bebf6cdd40f49496369c21437b;hp=5d4792d4ab72aa2194d2f9a1a3916cda337ded91;hpb=908b1c93014c3f30d883b25cbe50c166edfc2232;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 5d4792d4ab..bbebbcaf15 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -79,8 +79,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);
@@ -99,9 +99,14 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void set_button_names ();
 	void show_send (boost::shared_ptr<ARDOUR::Send>);
 
+	bool mixer_owned () const {
+		return _mixer_owned;
+	}
+
 	sigc::signal<void>      WidthChanged;
 
 	static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
+	static PBD::Signal1<void,MixerStrip*> CatchDeletion;
 
   protected:
 	friend class Mixer_UI;
@@ -147,6 +152,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Gtk::ToggleButton _mono_button;
 
 	Gtk::Table button_table;
+        Gtk::Table solo_led_table;
+        Gtk::HBox  solo_led_box;
 	Gtk::Table middle_button_table;
 	Gtk::Table bottom_button_table;
 
@@ -155,7 +162,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	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 +172,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;
@@ -214,8 +221,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	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 +233,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 +243,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;
@@ -265,7 +272,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void revert_to_default_display ();
 
 	void drop_send ();
-	sigc::connection send_gone_connection;
+	PBD::ScopedConnection send_gone_connection;
 
 	void reset_strip_style ();