rationalize destruction pathway (some more); tidy-ify some ImageFrame code

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 5d4792d4ab72aa2194d2f9a1a3916cda337ded91..acb69534b3d590b667e1076590bd8a416f059aa2 100644 (file)
--- 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;
@@ -165,7 +166,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 +215,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 ();
@@ -236,7 +237,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 +266,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 ();