X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvca.cc;h=a2b16913bbb05c3bab47d43c4cbbfff78f6f4551;hb=6bf40e3a44d8bb6952972fc19f34bb8b07523a33;hp=72c0a2cdcb71719e949ed019ca5af0bc6f15e193;hpb=1e9b2abe730b89ff212ef61cee9e7112bf7c8f50;p=ardour.git

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index 72c0a2cdcb..a2b16913bb 100644
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -19,19 +19,22 @@
 #include "pbd/convert.h"
 
 #include "ardour/automation_control.h"
+#include "ardour/debug.h"
 #include "ardour/gain_control.h"
+#include "ardour/monitor_control.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/vca.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using std::string;
 
-gint VCA::next_number = 1;
+Glib::Threads::Mutex VCA::number_lock;
+int32_t VCA::next_number = 1;
 string VCA::xml_node_name (X_("VCA"));
 
 string
@@ -40,29 +43,32 @@ VCA::default_name_template ()
 	return _("VCA %n");
 }
 
-int
+int32_t
 VCA::next_vca_number ()
 {
-	/* recall that atomic_int_add() returns the value before the add. We
-	 * start at one, then next one will be two etc.
-	 */
-	return g_atomic_int_add (&next_number, 1);
+	/* we could use atomic inc here, but elsewhere we need more complete
+	   mutex semantics, so we have to do it here also.
+	*/
+	Glib::Threads::Mutex::Lock lm (number_lock);
+	return next_number++;
 }
 
 void
-VCA::set_next_vca_number (uint32_t n)
+VCA::set_next_vca_number (int32_t n)
 {
-	g_atomic_int_set (&next_number, n);
+	Glib::Threads::Mutex::Lock lm (number_lock);
+	next_number = n;
 }
 
-uint32_t
+int32_t
 VCA::get_next_vca_number ()
 {
-	return g_atomic_int_get (&next_number);
+	Glib::Threads::Mutex::Lock lm (number_lock);
+	return next_number;
 }
 
-VCA::VCA (Session& s,  uint32_t num, const string& name)
-	: Stripable (s, name)
+VCA::VCA (Session& s,  int32_t num, const string& name)
+	: Stripable (s, name, PresentationInfo (num, PresentationInfo::VCA))
 	, Muteable (s, name)
 	, Automatable (s)
 	, _number (num)
@@ -85,13 +91,16 @@ VCA::init ()
 
 VCA::~VCA ()
 {
-	DropReferences (); /* emit signal */
-}
-
-uint32_t
-VCA::remote_control_id () const
-{
-	return 9999999 + _number;
+	DEBUG_TRACE (DEBUG::Destruction, string_compose ("delete VCA %1\n", number()));
+	{
+		Glib::Threads::Mutex::Lock lm (number_lock);
+		if (_number == next_number - 1) {
+			/* this was the "last" VCA added, so rewind the next number so
+			 * that future VCAs get numbered as intended
+			 */
+			next_number--;
+		}
+	}
 }
 
 XMLNode&
@@ -101,6 +110,8 @@ VCA::get_state ()
 	node->add_property (X_("name"), _name);
 	node->add_property (X_("number"), _number);
 
+	node->add_child_nocopy (_presentation_info.get_state());
+
 	node->add_child_nocopy (_gain_control->get_state());
 	node->add_child_nocopy (_solo_control->get_state());
 	node->add_child_nocopy (_mute_control->get_state());
@@ -116,6 +127,8 @@ VCA::set_state (XMLNode const& node, int version)
 {
 	XMLProperty const* prop;
 
+	Stripable::set_state (node, version);
+
 	if ((prop = node.property ("name")) != 0) {
 		set_name (prop->value());
 	}
@@ -157,29 +170,31 @@ VCA::clear_all_solo_state ()
 	_solo_control->clear_all_solo_state ();
 }
 
-int
-VCA::assign_controls (boost::shared_ptr<VCA> vca)
+MonitorState
+VCA::monitoring_state () const
 {
-	_gain_control->add_master (vca->gain_control());
-	_solo_control->add_master (vca->solo_control());
-	_mute_control->add_master (vca->mute_control());
+	/* XXX this has to get more complex but not clear how */
+	return MonitoringInput;
+}
 
-	return 0;
+bool
+VCA::slaved () const
+{
+	if (!_gain_control) {
+		return false;
+	}
+	/* just test one particular control, not all of them */
+	return _gain_control->slaved ();
 }
 
-int
-VCA::unassign_controls (boost::shared_ptr<VCA> vca)
+bool
+VCA::slaved_to (boost::shared_ptr<VCA> vca) const
 {
-	if (!vca) {
-		/* unassign from all */
-		_gain_control->clear_masters ();
-		_solo_control->clear_masters ();
-		_mute_control->clear_masters ();
-	} else {
-		_gain_control->remove_master (vca->gain_control());
-		_solo_control->remove_master (vca->solo_control());
-		_mute_control->remove_master (vca->mute_control());
+	if (!vca || !_gain_control) {
+		return false;
 	}
 
-	return 0;
+	/* just test one particular control, not all of them */
+
+	return _gain_control->slaved_to (vca->gain_control());
 }