Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

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

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index f3109a707df23599392f9dcf95518f30af190f45..5ab78cdf768927863acd9cc89728c8d7aceac373 100644 (file)
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -43,6 +43,7 @@ namespace Properties {
        extern PBD::PropertyDescriptor<bool> recenable;
        extern PBD::PropertyDescriptor<bool> select;
        extern PBD::PropertyDescriptor<bool> edit;
+       extern PBD::PropertyDescriptor<bool> route_active;
        /* we use this, but its declared in region.cc */
        extern PBD::PropertyDescriptor<bool> hidden;
 };
@@ -52,11 +53,11 @@ class Track;
 class AudioTrack;
 class Session;
 
-class RouteGroup : public SessionObject 
+class RouteGroup : public SessionObject
 {
   public:
        static void make_property_quarks();
-       
+
        RouteGroup (Session& s, const std::string &n);
        ~RouteGroup ();
 
@@ -69,6 +70,7 @@ class RouteGroup : public SessionObject
        bool is_recenable () const { return _recenable.val(); }
        bool is_select () const { return _select.val(); }
        bool is_edit () const { return _edit.val(); }
+       bool is_route_active () const { return _route_active.val(); }
 
        bool empty() const {return routes->empty();}
        size_t size() const { return routes->size();}
@@ -86,27 +88,17 @@ class RouteGroup : public SessionObject
        void set_recenable (bool yn);
        void set_select (bool yn);
        void set_edit (bool yn);
+       void set_route_active (bool yn);
 
        bool enabled_property (PBD::PropertyID);
 
        int add (boost::shared_ptr<Route>);
        int remove (boost::shared_ptr<Route>);
 
-       void apply (void (Route::*func)(void *), void *src) {
-               for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) {
-                       ((*i).get()->*func)(src);
-               }
-       }
-
-       template<class T> void apply (void (Route::*func)(T, void *), T val, void *src) {
-               for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) {
-                       ((*i).get()->*func)(val, src);
-               }
-       }
-
-       template<class T> void foreach_route (T *obj, void (T::*func)(Route&)) {
-               for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) {
-                       (obj->*func)(**i);
+       template<typename Function>
+       void foreach_route (Function f) {
+               for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+                       f (i->get());
                }
        }
 
@@ -123,18 +115,18 @@ class RouteGroup : public SessionObject
                changed();
        }
 
-       void make_subgroup ();
+       void make_subgroup (bool, Placement);
        void destroy_subgroup ();
 
        boost::shared_ptr<RouteList> route_list() { return routes; }
 
-       PBD::Signal0<void> changed;
-       PBD::Signal1<void,void*> FlagsChanged;
+       /** Emitted when a route has been added to or removed from this group */
+       PBD::Signal0<void> MembershipChanged;
 
        XMLNode& get_state ();
-       
+
        int set_state (const XMLNode&, int version);
-       
+
 private:
        boost::shared_ptr<RouteList> routes;
        boost::shared_ptr<Route> subgroup_bus;
@@ -148,6 +140,7 @@ private:
        PBD::Property<bool> _recenable;
        PBD::Property<bool> _select;
        PBD::Property<bool> _edit;
+       PBD::Property<bool> _route_active;
 
        void remove_when_going_away (boost::weak_ptr<Route>);
        int set_state_2X (const XMLNode&, int);