added RCU handling of Session route list, and major use of shared_ptr<T> everywhere else. plus a few bug fixes for issues discovered with -Wextra

git-svn-id: svn://localhost/ardour2/trunk@707 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 23 deletions

diff --git a/libs/ardour/ardour/session_route.h b/libs/ardour/ardour/session_route.h
index afe78b394e..feacc14775 100644
--- a/libs/ardour/ardour/session_route.h
+++ b/libs/ardour/ardour/session_route.h
@@ -33,14 +33,10 @@ namespace ARDOUR {
 template<class T> void 
 Session::foreach_route (T *obj, void (T::*func)(Route&))
 {
-	RouteList public_order;
-
-	{
-		Glib::RWLock::ReaderLock lm (route_lock);
-		public_order = routes;
-	}
-
+	boost::shared_ptr<RouteList> r = routes.reader();
+	RouteList public_order (*r);
 	RoutePublicOrderSorter cmp;
+
 	public_order.sort (cmp);
 
 	for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) {
@@ -49,16 +45,12 @@ Session::foreach_route (T *obj, void (T::*func)(Route&))
 }
 
 template<class T> void 
-Session::foreach_route (T *obj, void (T::*func)(Route*))
+Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>))
 {
-	RouteList public_order;
-
-	{
-		Glib::RWLock::ReaderLock lm (route_lock);
-		public_order = routes;
-	}
-
+	boost::shared_ptr<RouteList> r = routes.reader();
+	RouteList public_order (*r);
 	RoutePublicOrderSorter cmp;
+
 	public_order.sort (cmp);
 
 	for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) {
@@ -66,18 +58,13 @@ Session::foreach_route (T *obj, void (T::*func)(Route*))
 	}
 }
 
-
 template<class T, class A> void 
 Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1)
 {
-	RouteList public_order;
-
-	{
-		Glib::RWLock::ReaderLock lm (route_lock);
-		public_order = routes;
-	}
-
+	boost::shared_ptr<RouteList> r = routes.reader();
+	RouteList public_order (*r);
 	RoutePublicOrderSorter cmp;
+
 	public_order.sort (cmp);
 
 	for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) {