X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Froute_group.h;h=2f62193d83843cbdd79a500b91310b434dee20c4;hb=99fb7346f07be28f548855b3e9c1ff2a174d994f;hp=7dbdc1d8823a1de69ddc6b1bc8c6a1a69f319e26;hpb=3104041e67b0f7c476c7478ce4b7a4af3d277da7;p=ardour.git

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 7dbdc1d882..2f62193d83 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -42,7 +42,9 @@ namespace Properties {
 	extern PBD::PropertyDescriptor<bool> solo;
 	extern PBD::PropertyDescriptor<bool> recenable;
 	extern PBD::PropertyDescriptor<bool> select;
-	extern PBD::PropertyDescriptor<bool> edit;
+	extern PBD::PropertyDescriptor<bool> route_active;
+	extern PBD::PropertyDescriptor<bool> color;
+	extern PBD::PropertyDescriptor<bool> monitoring;
 	/* we use this, but its declared in region.cc */
 	extern PBD::PropertyDescriptor<bool> hidden;
 };
@@ -52,11 +54,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 ();
 
@@ -68,7 +70,9 @@ class RouteGroup : public SessionObject
 	bool is_solo () const { return _solo.val(); }
 	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 is_color () const { return _color.val(); }
+	bool is_monitoring() const { return _monitoring.val(); }
 
 	bool empty() const {return routes->empty();}
 	size_t size() const { return routes->size();}
@@ -85,40 +89,19 @@ class RouteGroup : public SessionObject
 	void set_solo (bool yn);
 	void set_recenable (bool yn);
 	void set_select (bool yn);
-	void set_edit (bool yn);
+	void set_route_active (bool yn);
+	void set_color (bool yn);
+	void set_monitoring (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);
-		}
-	}
-
-	void apply (void (Route::*func)()) {
+	template<typename Function>
+	void foreach_route (Function f) {
 		for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-			((*i).get()->*func)();
-		}
-	}
-
-	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 apply (void (Route::*func)(T), T val) {
-		for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-			((*i).get()->*func)(val);
-		}
-	}
-
-	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);
+			f (i->get());
 		}
 	}
 
@@ -135,18 +118,21 @@ class RouteGroup : public SessionObject
 		changed();
 	}
 
-	void make_subgroup ();
+        bool has_subgroup() const;
+	void make_subgroup (bool, Placement);
 	void destroy_subgroup ();
 
 	boost::shared_ptr<RouteList> route_list() { return routes; }
 
-	/** Emitted when a route has been added to or removed from this group */
-	PBD::Signal0<void> MembershipChanged;
+	/** Emitted when a route has been added to this group */
+	PBD::Signal2<void, RouteGroup *, boost::weak_ptr<ARDOUR::Route> > RouteAdded;
+	/** Emitted when a route has been removed from this group */
+	PBD::Signal2<void, RouteGroup *, boost::weak_ptr<ARDOUR::Route> > RouteRemoved;
 
 	XMLNode& get_state ();
-	
+
 	int set_state (const XMLNode&, int version);
-	
+
 private:
 	boost::shared_ptr<RouteList> routes;
 	boost::shared_ptr<Route> subgroup_bus;
@@ -159,7 +145,9 @@ private:
 	PBD::Property<bool> _solo;
 	PBD::Property<bool> _recenable;
 	PBD::Property<bool> _select;
-	PBD::Property<bool> _edit;
+	PBD::Property<bool> _route_active;
+	PBD::Property<bool> _color;
+	PBD::Property<bool> _monitoring;
 
 	void remove_when_going_away (boost::weak_ptr<Route>);
 	int set_state_2X (const XMLNode&, int);