From 67b74ed1c7a3887ddd0e289c54c09ac8f7529518 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 15 May 2012 00:06:26 +0000 Subject: Remove bind to shared_ptr. git-svn-id: svn://localhost/ardour2/branches/3.0@12281 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/region_factory.h | 2 +- libs/ardour/region_factory.cc | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'libs') diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index dfbcd480dd..337821e0ea 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -83,7 +83,7 @@ public: static void get_regions_using_source (boost::shared_ptr, std::set >& ); static void remove_regions_using_source (boost::shared_ptr); - static void map_remove (boost::shared_ptr); + static void map_remove (boost::weak_ptr); static void map_remove_with_equivalents (boost::shared_ptr); static void delete_all_regions (); static const RegionMap& regions() { return region_map; } diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index f739483821..b5195d80d9 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -321,7 +321,7 @@ RegionFactory::map_add (boost::shared_ptr r) region_map.insert (p); } - r->DropReferences.connect_same_thread (region_list_connections, boost::bind (&RegionFactory::map_remove, r)); + r->DropReferences.connect_same_thread (region_list_connections, boost::bind (&RegionFactory::map_remove, boost::weak_ptr (r))); r->PropertyChanged.connect_same_thread ( region_list_connections, @@ -332,8 +332,13 @@ RegionFactory::map_add (boost::shared_ptr r) } void -RegionFactory::map_remove (boost::shared_ptr r) +RegionFactory::map_remove (boost::weak_ptr w) { + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + Glib::Mutex::Lock lm (region_map_lock); RegionMap::iterator i = region_map.find (r->id()); -- cgit v1.2.3