Merged with trunk R992.

[ardour.git] / gtk2_ardour / redirect_box.cc

diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index a7b709682977f757ec6d8b87764e5153bc7df75a..35b96a410f136a6513e5d14d31f1c90cbb77bc1c 100644 (file)
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -156,9 +156,9 @@ RedirectBox::~RedirectBox ()
 }
 
 void
-RedirectBox::object_drop (string type, uint32_t cnt, void** ptr)
+RedirectBox::object_drop (string type, uint32_t cnt, const boost::shared_ptr<Redirect>* ptr)
 {
-       if (type != "redirects" || cnt == 0 || ptr == 0) {
+       if (type != "redirects" || cnt == 0 || !ptr) {
                return;
        }
 
@@ -167,7 +167,7 @@ RedirectBox::object_drop (string type, uint32_t cnt, void** ptr)
        list<boost::shared_ptr<Redirect> > redirects;
        
        for (uint32_t n = 0; n < cnt; ++n) {
-               redirects.push_back (boost::shared_ptr<Redirect> ((Redirect*) ptr[n]));
+               redirects.push_back (ptr[n]);
        }
        
        paste_redirect_list (redirects);