Remove frame conversion for MidiRegionView::note_in_region_range(), speed up tempo...

[ardour.git] / libs / ardour / ardour / session_route.h

diff --git a/libs/ardour/ardour/session_route.h b/libs/ardour/ardour/session_route.h
index cfaa13cdc8c354f182e224c2fd17b0524e84f407..22bfc1f032b1030a1a9166cf913aec5ad5e2a983 100644 (file)
--- a/libs/ardour/ardour/session_route.h
+++ b/libs/ardour/ardour/session_route.h
@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/session.h"
 #include "ardour/route.h"
@@ -30,13 +30,14 @@
 namespace ARDOUR {
 
 template<class T> void
-Session::foreach_route (T *obj, void (T::*func)(Route&))
+Session::foreach_route (T *obj, void (T::*func)(Route&), bool sort)
 {
        boost::shared_ptr<RouteList> r = routes.reader();
        RouteList public_order (*r);
-       RoutePublicOrderSorter cmp;
 
-       public_order.sort (cmp);
+       if (sort) {
+               public_order.sort (RoutePublicOrderSorter());
+       }
 
        for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) {
                (obj->*func) (**i);
@@ -44,13 +45,14 @@ Session::foreach_route (T *obj, void (T::*func)(Route&))
 }
 
 template<class T> void
-Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>))
+Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>), bool sort)
 {
        boost::shared_ptr<RouteList> r = routes.reader();
        RouteList public_order (*r);
-       RoutePublicOrderSorter cmp;
 
-       public_order.sort (cmp);
+       if (sort) {
+               public_order.sort (RoutePublicOrderSorter());
+       }
 
        for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) {
                (obj->*func) (*i);
@@ -58,13 +60,14 @@ Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>))
 }
 
 template<class T, class A> void
-Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1)
+Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1, bool sort)
 {
        boost::shared_ptr<RouteList> r = routes.reader();
        RouteList public_order (*r);
-       RoutePublicOrderSorter cmp;
 
-       public_order.sort (cmp);
+       if (sort) {
+               public_order.sort (RoutePublicOrderSorter());
+       }
 
        for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) {
                (obj->*func) (**i, arg1);