X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=0d3878fc2016d20da726fa3d1fcbb7cb12b51534;hb=a8e019c9e0a0fcbbe9aa75f25dba90ca1a5eda2b;hp=d5b247019bb65af68658016a6ad91fca30bcb855;hpb=61cade6d59118288e90a405e0f4fbc24d0108814;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index d5b247019b..0d3878fc20 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);
@@ -102,6 +102,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	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 +148,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 +158,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;
@@ -167,8 +170,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	std::string longest_label;
 
-	sigc::connection newplug_connection;
-
 	gint    mark_update_safe ();
 	guint32 mode_switch_in_progress;
 
@@ -216,8 +217,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 ();
@@ -228,7 +229,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*);
@@ -267,7 +268,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 ();