Don't add duplicate remote_control_id to active banks. Notes and tweaks.

git-svn-id: svn://localhost/ardour2/trunk@1471 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 2 deletions

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 28bbaf8c2b..8bff3c4538 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -28,7 +28,14 @@ class MackieButtonHandler;
 class Surface
 {
 public:
-	Surface( uint32_t max_strips );
+	/**
+		A Surface can be made up of multiple units. eg one Mackie MCU plus
+		one or more Mackie MCU extenders.
+		
+		\param max_strips is the number of strips for the entire surface.
+		\param unit_strips is the number of strips per unit.
+	*/
+	Surface( uint32_t max_strips, uint32_t unit_strips = 8 );
 	virtual ~Surface();
 
 	/// Calls the virtual initialisation methods. This *must* be called after
@@ -56,7 +63,7 @@ public:
 	std::map<std::string,Control*> controls_by_name;
 
 	/// The collection of all numbered strips. No master
-	/// strip in here. 
+	/// strip in here.
 	typedef std::vector<Strip*> Strips;
 	Strips strips;
 
@@ -78,6 +85,7 @@ protected:
 
 private:
 	uint32_t _max_strips;
+	uint32_t _unit_strips;
 };
 
 }