X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Froute_group.cc;h=188ec71f8710ddaa28a5be728916316ae4548c76;hb=bfe90109590a732589902acd392e548441134319;hp=e1d43f4cd6a72401d2ac8eccddc943cb3b34db2c;hpb=bbb65d07d33160366533d9f2390f3f8d56fcb8e1;p=ardour.git

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index e1d43f4cd6..188ec71f87 100644
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -17,7 +17,6 @@
 
 */
 
-#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
 #include <algorithm>
@@ -28,6 +27,7 @@
 #include "pbd/strsplit.h"
 
 #include "ardour/amp.h"
+#include "ardour/debug.h"
 #include "ardour/route_group.h"
 #include "ardour/audio_track.h"
 #include "ardour/audio_diskstream.h"
@@ -37,15 +37,86 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace std;
 
-RouteGroup::RouteGroup (Session& s, const string &n, Flag f, Property p)
-	: _session (s)
+namespace ARDOUR {
+	namespace Properties {
+		PropertyDescriptor<bool> relative;
+		PropertyDescriptor<bool> active;
+		PropertyDescriptor<bool> gain;
+		PropertyDescriptor<bool> mute;
+		PropertyDescriptor<bool> solo;
+		PropertyDescriptor<bool> recenable;
+		PropertyDescriptor<bool> select;
+		PropertyDescriptor<bool> edit;
+		PropertyDescriptor<bool> route_active;
+		PropertyDescriptor<bool> color;
+		PropertyDescriptor<bool> monitoring;
+	}
+}
+
+void
+RouteGroup::make_property_quarks ()
+{
+	Properties::relative.property_id = g_quark_from_static_string (X_("relative"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for relative = %1\n", 	Properties::relative.property_id));
+	Properties::active.property_id = g_quark_from_static_string (X_("active"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for active = %1\n", 	Properties::active.property_id));
+	Properties::hidden.property_id = g_quark_from_static_string (X_("hidden"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for hidden = %1\n", 	Properties::hidden.property_id));
+	Properties::gain.property_id = g_quark_from_static_string (X_("gain"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for gain = %1\n", 	Properties::gain.property_id));
+	Properties::mute.property_id = g_quark_from_static_string (X_("mute"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for mute = %1\n", 	Properties::mute.property_id));
+	Properties::solo.property_id = g_quark_from_static_string (X_("solo"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for solo = %1\n", 	Properties::solo.property_id));
+	Properties::recenable.property_id = g_quark_from_static_string (X_("recenable"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for recenable = %1\n", 	Properties::recenable.property_id));
+	Properties::select.property_id = g_quark_from_static_string (X_("select"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for select = %1\n", 	Properties::select.property_id));
+	Properties::edit.property_id = g_quark_from_static_string (X_("edit"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for edit = %1\n", 	Properties::edit.property_id));
+	Properties::route_active.property_id = g_quark_from_static_string (X_("route-active"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for route-active = %1\n", Properties::route_active.property_id));
+	Properties::color.property_id = g_quark_from_static_string (X_("color"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for color = %1\n",       Properties::color.property_id));
+	Properties::monitoring.property_id = g_quark_from_static_string (X_("monitoring"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for monitoring = %1\n",       Properties::monitoring.property_id));
+}
+
+#define ROUTE_GROUP_DEFAULT_PROPERTIES  _relative (Properties::relative, false) \
+	, _active (Properties::active, false) \
+	, _hidden (Properties::hidden, false) \
+	, _gain (Properties::gain, false) \
+	, _mute (Properties::mute, false) \
+	, _solo (Properties::solo, false) \
+	, _recenable (Properties::recenable, false) \
+	, _select (Properties::select, false) \
+	, _edit (Properties::edit, false) \
+	, _route_active (Properties::route_active, false) \
+	, _color (Properties::color, false) \
+	, _monitoring (Properties::monitoring, false)
+
+RouteGroup::RouteGroup (Session& s, const string &n)
+	: SessionObject (s, n)
 	, routes (new RouteList)
-	, _name (n)
-	, _flags (f)
-	, _properties (Property (p))
+	, ROUTE_GROUP_DEFAULT_PROPERTIES
 {
+	_xml_node_name = X_("RouteGroup");
+
+	add_property (_relative);
+	add_property (_active);
+	add_property (_hidden);
+	add_property (_gain);
+	add_property (_mute);
+	add_property (_solo);
+	add_property (_recenable);
+	add_property (_select);
+	add_property (_edit);
+	add_property (_route_active);
+	add_property (_color);
+	add_property (_monitoring);
 }
 
 RouteGroup::~RouteGroup ()
@@ -55,19 +126,11 @@ RouteGroup::~RouteGroup ()
 		++tmp;
 
 		(*i)->leave_route_group ();
-		
+
 		i = tmp;
 	}
 }
 
-void
-RouteGroup::set_name (string str)
-{
-	_name = str;
-	_session.set_dirty ();
-	FlagsChanged (0); /* EMIT SIGNAL */
-}
-
 /** Add a route to a group.  Adding a route which is already in the group is allowed; nothing will happen.
  *  @param r Route to add.
  */
@@ -77,16 +140,16 @@ RouteGroup::add (boost::shared_ptr<Route> r)
 	if (find (routes->begin(), routes->end(), r) != routes->end()) {
 		return 0;
 	}
-	
+
 	r->leave_route_group ();
 
 	routes->push_back (r);
 
 	r->join_route_group (this);
 	r->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::remove_when_going_away, this, boost::weak_ptr<Route> (r)));
-	
+
 	_session.set_dirty ();
-	changed (); /* EMIT SIGNAL */
+	RouteAdded (this, boost::weak_ptr<Route> (r)); /* EMIT SIGNAL */
 	return 0;
 }
 
@@ -109,7 +172,7 @@ RouteGroup::remove (boost::shared_ptr<Route> r)
 		r->leave_route_group ();
 		routes->erase (i);
 		_session.set_dirty ();
-		changed (); /* EMIT SIGNAL */
+		RouteRemoved (this, boost::weak_ptr<Route> (r)); /* EMIT SIGNAL */
 		return 0;
 	}
 
@@ -118,58 +181,62 @@ RouteGroup::remove (boost::shared_ptr<Route> r)
 
 
 gain_t
-RouteGroup::get_min_factor(gain_t factor)
+RouteGroup::get_min_factor (gain_t factor)
 {
-	gain_t g;
-
-	for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) {
-		g = (*i)->amp()->gain();
+	for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+		gain_t const g = (*i)->amp()->gain();
 
-		if ( (g+g*factor) >= 0.0f)
+		if ((g + g * factor) >= 0.0f) {
 			continue;
+		}
 
-		if ( g <= 0.0000003f )
+		if (g <= 0.0000003f) {
 			return 0.0f;
+		}
 
-		factor = 0.0000003f/g - 1.0f;
+		factor = 0.0000003f / g - 1.0f;
 	}
+	
 	return factor;
 }
 
 gain_t
-RouteGroup::get_max_factor(gain_t factor)
+RouteGroup::get_max_factor (gain_t factor)
 {
-	gain_t g;
-
 	for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) {
-		g = (*i)->amp()->gain();
+		gain_t const g = (*i)->amp()->gain();
 
 		// if the current factor woulnd't raise this route above maximum
-		if ( (g+g*factor) <= 1.99526231f)
+		if ((g + g * factor) <= 1.99526231f) {
 			continue;
+		}
 
 		// if route gain is already at peak, return 0.0f factor
-	    if (g>=1.99526231f)
+		if (g >= 1.99526231f) {
 			return 0.0f;
+		}
 
 		// factor is calculated so that it would raise current route to max
-		factor = 1.99526231f/g - 1.0f;
+		factor = 1.99526231f / g - 1.0f;
 	}
 
 	return factor;
 }
 
 XMLNode&
-RouteGroup::get_state (void)
+RouteGroup::get_state ()
 {
 	XMLNode *node = new XMLNode ("RouteGroup");
-	node->add_property ("name", _name);
-	node->add_property ("flags", enum_2_string (_flags));
-	node->add_property ("properties", enum_2_string (_properties));
+
+	char buf[64];
+	id().print (buf, sizeof (buf));
+	node->add_property ("id", buf);
+
+	add_properties (*node);
 
 	if (!routes->empty()) {
 		stringstream str;
-		
+
 		for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
 			str << (*i)->id () << ' ';
 		}
@@ -189,30 +256,21 @@ RouteGroup::set_state (const XMLNode& node, int version)
 
 	const XMLProperty *prop;
 
-	if ((prop = node.property ("name")) != 0) {
-		_name = prop->value();
-	}
-
-	if ((prop = node.property ("flags")) != 0) {
-		_flags = Flag (string_2_enum (prop->value(), _flags));
-	}
-
-	if ((prop = node.property ("properties")) != 0) {
-		_properties = Property (string_2_enum (prop->value(), _properties));
-	}
+	set_id (node);
+	set_values (node);
 
 	if ((prop = node.property ("routes")) != 0) {
 		stringstream str (prop->value());
 		vector<string> ids;
 		split (str.str(), ids, ' ');
-		
+
 		for (vector<string>::iterator i = ids.begin(); i != ids.end(); ++i) {
 			PBD::ID id (*i);
 			boost::shared_ptr<Route> r = _session.route_by_id (id);
-			
+
 			if (r) {
 				add (r);
-			} 
+			}
 		}
 	}
 
@@ -222,76 +280,168 @@ RouteGroup::set_state (const XMLNode& node, int version)
 int
 RouteGroup::set_state_2X (const XMLNode& node, int /*version*/)
 {
-	XMLProperty const * prop;
+	set_values (node);
 
-	if ((prop = node.property ("name")) != 0) {
-		_name = prop->value();
+	if (node.name() == "MixGroup") {
+		_gain = true;
+		_mute = true;
+		_solo = true;
+		_recenable = true;
+		_edit = false;
+		_route_active = true;
+		_color = false;
+	} else if (node.name() == "EditGroup") {
+		_gain = false;
+		_mute = false;
+		_solo = false;
+		_recenable = false;
+		_edit = true;
+		_route_active = false;
+		_color = false;
 	}
 
-	if ((prop = node.property ("flags")) != 0) {
-		_flags = Flag (string_2_enum (prop->value(), _flags));
+	return 0;
+}
+
+void
+RouteGroup::set_gain (bool yn)
+{
+	if (is_gain() == yn) {
+		return;
 	}
+	_gain = yn;
+}
 
-	if (node.name() == "MixGroup") {
-		_properties = Property (Gain | Mute | Solo | RecEnable);
-	} else if (node.name() == "EditGroup") {
-		_properties = Property (Select | Edit);
+void
+RouteGroup::set_mute (bool yn)
+{
+	if (is_mute() == yn) {
+		return;
 	}
+	_mute = yn;
+}
 
-	return 0;
+void
+RouteGroup::set_solo (bool yn)
+{
+	if (is_solo() == yn) {
+		return;
+	}
+	_solo = yn;
 }
 
 void
-RouteGroup::set_active (bool yn, void *src)
+RouteGroup::set_recenable (bool yn)
 {
-	if (is_active() == yn) {
+	if (is_recenable() == yn) {
 		return;
 	}
-	if (yn) {
-		_flags = Flag (_flags | Active);
-	} else {
-		_flags = Flag (_flags & ~Active);
+	_recenable = yn;
+}
+
+void
+RouteGroup::set_select (bool yn)
+{
+	if (is_select() == yn) {
+		return;
 	}
-	_session.set_dirty ();
-	FlagsChanged (src); /* EMIT SIGNAL */
+	_select = yn;
 }
 
 void
-RouteGroup::set_relative (bool yn, void *src)
+RouteGroup::set_edit (bool yn)
+{
+	if (is_edit() == yn) {
+		return;
+	}
+	_edit = yn;
+}
 
+void
+RouteGroup::set_route_active (bool yn)
 {
-	if (is_relative() == yn) {
+	if (is_route_active() == yn) {
 		return;
 	}
-	if (yn) {
-		_flags = Flag (_flags | Relative);
-	} else {
-		_flags = Flag (_flags & ~Relative);
+	_route_active = yn;
+}
+
+void
+RouteGroup::set_color (bool yn)
+{
+	if (is_color() == yn) {
+		return;
+	}
+	_color = yn;
+
+	/* This is a bit of a hack, but this might change
+	   our route's effective color, so emit gui_changed
+	   for our routes.
+	*/
+
+	for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+		(*i)->gui_changed (X_("color"), this);
+	}
+}
+
+void
+RouteGroup::set_monitoring (bool yn) 
+{
+	if (is_monitoring() == yn) {
+		return;
+	}
+
+	_monitoring = yn;
+	send_change (PropertyChange (Properties::monitoring));
+
+	_session.set_dirty ();
+}
+
+void
+RouteGroup::set_active (bool yn, void* /*src*/)
+{
+	if (is_active() == yn) {
+		return;
 	}
+
+	_active = yn;
+	send_change (PropertyChange (Properties::active));
+
 	_session.set_dirty ();
-	FlagsChanged (src); /* EMIT SIGNAL */
 }
 
 void
-RouteGroup::set_hidden (bool yn, void *src)
+RouteGroup::set_relative (bool yn, void* /*src*/)
+{
+	if (is_relative() == yn) {
+		return;
+	}
+	_relative = yn;
+	_session.set_dirty ();
+}
 
+void
+RouteGroup::set_hidden (bool yn, void* /*src*/)
 {
 	if (is_hidden() == yn) {
 		return;
 	}
+
 	if (yn) {
-		_flags = Flag (_flags | Hidden);
+		_hidden = true;
 		if (Config->get_hiding_groups_deactivates_groups()) {
-			_flags = Flag (_flags & ~Active);
+			_active = false;
 		}
 	} else {
-		_flags = Flag (_flags & ~Hidden);
+		_hidden = false;
 		if (Config->get_hiding_groups_deactivates_groups()) {
-			_flags = Flag (_flags | Active);
+			_active = true;
 		}
 	}
+
+	send_change (Properties::hidden);
+
 	_session.set_dirty ();
-	FlagsChanged (src); /* EMIT SIGNAL */
 }
 
 void
@@ -306,7 +456,7 @@ RouteGroup::audio_track_group (set<boost::shared_ptr<AudioTrack> >& ats)
 }
 
 void
-RouteGroup::make_subgroup ()
+RouteGroup::make_subgroup (bool aux, Placement placement)
 {
 	RouteList rl;
 	uint32_t nin = 0;
@@ -326,7 +476,7 @@ RouteGroup::make_subgroup ()
 
 	try {
 		/* use master bus etc. to determine default nouts */
-		rl = _session.new_audio_route (false, nin, 2, 0, 1);
+		rl = _session.new_audio_route (nin, 2, 0, 1);
 	} catch (...) {
 		return;
 	}
@@ -334,11 +484,18 @@ RouteGroup::make_subgroup ()
 	subgroup_bus = rl.front();
 	subgroup_bus->set_name (_name);
 
-	boost::shared_ptr<Bundle> bundle = subgroup_bus->input()->bundle ();
+	if (aux) {
 
-	for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-		(*i)->output()->disconnect (this);
-		(*i)->output()->connect_ports_to_bundle (bundle, this);
+		_session.add_internal_sends (subgroup_bus, placement, routes);
+
+	} else {
+
+		boost::shared_ptr<Bundle> bundle = subgroup_bus->input()->bundle ();
+
+		for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+			(*i)->output()->disconnect (this);
+			(*i)->output()->connect_ports_to_bundle (bundle, this);
+		}
 	}
 }
 
@@ -348,7 +505,7 @@ RouteGroup::destroy_subgroup ()
 	if (!subgroup_bus) {
 		return;
 	}
-	
+
 	for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
 		(*i)->output()->disconnect (this);
 		/* XXX find a new bundle to connect to */
@@ -357,3 +514,14 @@ RouteGroup::destroy_subgroup ()
 	_session.remove_route (subgroup_bus);
 	subgroup_bus.reset ();
 }
+
+bool
+RouteGroup::enabled_property (PBD::PropertyID prop)
+{
+	OwnedPropertyList::iterator i = _properties->find (prop);
+	if (i == _properties->end()) {
+		return false;
+	}
+
+	return dynamic_cast<const PropertyTemplate<bool>* > (i->second)->val ();
+}