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 64579e0c33864b9e0c242d00bd3337acaea42241..acb69534b3d590b667e1076590bd8a416f059aa2 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -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;
@@ -214,8 +215,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void input_changed (ARDOUR::IOChange, void *);
        void output_changed (ARDOUR::IOChange, void *);
 
-       boost::signals2::scoped_connection panstate_connection;
-       boost::signals2::scoped_connection panstyle_connection;
+       PBD::ScopedConnection panstate_connection;
+       PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
 
        void update_diskstream_display ();
@@ -265,7 +266,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void revert_to_default_display ();
 
        void drop_send ();
-       boost::signals2::scoped_connection send_gone_connection;
+       PBD::ScopedConnection send_gone_connection;
 
        void reset_strip_style ();