X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Froute_group.h;h=763430e1f1c1d6a607ed4ebf5b747fb8c245759e;hb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;hp=f3109a707df23599392f9dcf95518f30af190f45;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index f3109a707d..763430e1f1 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -29,22 +29,25 @@
 #include "pbd/stateful.h"
 #include "pbd/signals.h"
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/session_object.h"
 
 namespace ARDOUR {
 
 namespace Properties {
-	extern PBD::PropertyDescriptor<bool> relative;
-	extern PBD::PropertyDescriptor<bool> active;
-	extern PBD::PropertyDescriptor<bool> gain;
-	extern PBD::PropertyDescriptor<bool> mute;
-	extern PBD::PropertyDescriptor<bool> solo;
-	extern PBD::PropertyDescriptor<bool> recenable;
-	extern PBD::PropertyDescriptor<bool> select;
-	extern PBD::PropertyDescriptor<bool> edit;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> relative;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> active;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> gain;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> mute;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> solo;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> recenable;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> select;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> route_active;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> color;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> monitoring;
 	/* we use this, but its declared in region.cc */
-	extern PBD::PropertyDescriptor<bool> hidden;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> hidden;
 };
 
 class Route;
@@ -52,11 +55,11 @@ class Track;
 class AudioTrack;
 class Session;
 
-class RouteGroup : public SessionObject 
+class LIBARDOUR_API RouteGroup : public SessionObject
 {
   public:
 	static void make_property_quarks();
-	
+
 	RouteGroup (Session& s, const std::string &n);
 	~RouteGroup ();
 
@@ -68,7 +71,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,28 +90,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);
-		}
-	}
-
-	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 +119,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; }
 
-	PBD::Signal0<void> changed;
-	PBD::Signal1<void,void*> FlagsChanged;
+	/** 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;
@@ -147,7 +146,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);