Large nasty commit in the form of a 5000 line patch chock-full of completely

[ardour.git] / gtk2_ardour / route_redirect_selection.cc

diff --git a/gtk2_ardour/route_redirect_selection.cc b/gtk2_ardour/route_redirect_selection.cc
index 8032ddbbb41b461e44b4fd48e7f5f762a759aa00..6d315e0aaecd10429b5570d4cbf626d5c16c0144 100644 (file)
--- a/gtk2_ardour/route_redirect_selection.cc
+++ b/gtk2_ardour/route_redirect_selection.cc
@@ -31,6 +31,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 
 RouteRedirectSelection&
@@ -89,7 +90,7 @@ RouteRedirectSelection::add (Redirect* r)
                redirects.push_back (r);
                
                void (RouteRedirectSelection::*pmf)(Redirect*) = &RouteRedirectSelection::remove;
-               r->GoingAway.connect (slot (*this, pmf));
+               r->GoingAway.connect (mem_fun(*this, pmf));
 
                RedirectsChanged();
        }
@@ -105,7 +106,7 @@ RouteRedirectSelection::add (const vector<Redirect*>& rlist)
                        redirects.push_back (*i);
                        
                        void (RouteRedirectSelection::*pmf)(Redirect*) = &RouteRedirectSelection::remove;
-                       (*i)->GoingAway.connect (slot (*this, pmf));
+                       (*i)->GoingAway.connect (mem_fun(*this, pmf));
                        changed = true;
                }
        }
@@ -146,7 +147,7 @@ RouteRedirectSelection::add (Route* r)
                routes.push_back (r);
 
                void (RouteRedirectSelection::*pmf)(Route*) = &RouteRedirectSelection::remove;
-               r->GoingAway.connect (bind (slot (*this, pmf), r));
+               r->GoingAway.connect (bind (mem_fun(*this, pmf), r));
 
                RoutesChanged();
        }