X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvca.cc;h=a2b16913bbb05c3bab47d43c4cbbfff78f6f4551;hb=6946bdc0830c9f0971d2cd0d54b27e343c54d96a;hp=d3c614debf27849da3a572ddfd7fb3a8669118ee;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index d3c614debf..a2b16913bb 100644
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -23,18 +23,18 @@
 #include "ardour/gain_control.h"
 #include "ardour/monitor_control.h"
 #include "ardour/rc_configuration.h"
-#include "ardour/record_enable_control.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
@@ -43,28 +43,31 @@ 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)
+VCA::VCA (Session& s,  int32_t num, const string& name)
 	: Stripable (s, name, PresentationInfo (num, PresentationInfo::VCA))
 	, Muteable (s, name)
 	, Automatable (s)
@@ -78,8 +81,6 @@ VCA::init ()
 {
 	_solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this));
 	_mute_control.reset (new MuteControl (_session, X_("mute"), *this));
-	_recenable_control.reset (new RecordEnableControl (_session, X_("recenable"), *this));
-	_monitor_control.reset (new MonitorControl (_session, X_("monitoring"), *this));
 
 	add_control (_gain_control);
 	add_control (_solo_control);
@@ -91,12 +92,15 @@ VCA::init ()
 VCA::~VCA ()
 {
 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("delete VCA %1\n", number()));
-}
-
-uint32_t
-VCA::remote_control_id () const
-{
-	return 9999999 + _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&
@@ -106,7 +110,7 @@ VCA::get_state ()
 	node->add_property (X_("name"), _name);
 	node->add_property (X_("number"), _number);
 
-	Stripable::add_state (*node);
+	node->add_child_nocopy (_presentation_info.get_state());
 
 	node->add_child_nocopy (_gain_control->get_state());
 	node->add_child_nocopy (_solo_control->get_state());
@@ -172,3 +176,25 @@ VCA::monitoring_state () const
 	/* XXX this has to get more complex but not clear how */
 	return MonitoringInput;
 }
+
+bool
+VCA::slaved () const
+{
+	if (!_gain_control) {
+		return false;
+	}
+	/* just test one particular control, not all of them */
+	return _gain_control->slaved ();
+}
+
+bool
+VCA::slaved_to (boost::shared_ptr<VCA> vca) const
+{
+	if (!vca || !_gain_control) {
+		return false;
+	}
+
+	/* just test one particular control, not all of them */
+
+	return _gain_control->slaved_to (vca->gain_control());
+}