From d09b466f056e0fb1c9809ce684c503f1e9963e29 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 21 May 2016 07:39:28 -0400
Subject: VCA: fix numbering scheme to allow contiguous numbers after removing
 the last VCA; remove unnecessary remote_control_id() method

---
 libs/ardour/ardour/vca.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'libs/ardour/ardour/vca.h')

diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h
index 3364dd514b..65de6fb9ef 100644
--- a/libs/ardour/ardour/vca.h
+++ b/libs/ardour/ardour/vca.h
@@ -23,6 +23,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+#include <glibmm/threads.h>
+
 #include "pbd/controllable.h"
 #include "pbd/statefuldestructible.h"
 
@@ -54,7 +56,6 @@ class LIBARDOUR_API VCA : public Stripable,
 	~VCA();
 
 	uint32_t number () const { return _number; }
-	uint32_t remote_control_id() const;
 
 	int init ();
 	XMLNode& get_state();
@@ -93,7 +94,7 @@ class LIBARDOUR_API VCA : public Stripable,
 	MonitorState monitoring_state() const;
 
 	static std::string default_name_template ();
-	static int next_vca_number ();
+	static uint32_t next_vca_number ();
 	static std::string xml_node_name;
 
 	/* used by Session to save/restore the atomic counter */
@@ -142,7 +143,7 @@ class LIBARDOUR_API VCA : public Stripable,
 	boost::shared_ptr<MonitorProcessor> monitor_control() const { return boost::shared_ptr<MonitorProcessor>(); }
 
   private:
-	uint32_t    _number;
+	uint32_t _number;
 
 	boost::shared_ptr<GainControl> _gain_control;
 	boost::shared_ptr<SoloControl> _solo_control;
@@ -151,7 +152,8 @@ class LIBARDOUR_API VCA : public Stripable,
 	// boost::shared_ptr<AutomationControl> _record_safe_control;
 	boost::shared_ptr<MonitorControl> _monitor_control;
 
-	static gint next_number;
+	static uint32_t next_number;
+	static Glib::Threads::Mutex number_lock;
 
 	void solo_target_going_away (boost::weak_ptr<Route>);
 	void mute_target_going_away (boost::weak_ptr<Route>);
-- 
cgit v1.2.3