MCP: drastically alter setup of Mackie surface to not use the CSV files in anyway, reformat chunks to match coding style standards, don't throw() if part of a sysex message is message

git-svn-id: svn://localhost/ardour2/branches/3.0@11820 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 9 deletions

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 05983cbfa2..8fa965bbef 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -38,7 +38,8 @@ public:
 		\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 );
+
+	Surface (uint32_t max_strips, uint32_t unit_strips);
 	virtual ~Surface();
 
 	/// Calls the virtual initialisation methods. This *must* be called after
@@ -76,10 +77,7 @@ public:
 	typedef std::map<std::string,Group*> Groups;
 	Groups groups;
 
-	uint32_t max_strips() const
-	{
-		return _max_strips;
-	}
+	uint32_t max_strips() const { return _max_strips; }
 	
 	/// map button ids to calls to press_ and release_ in mbh
 	virtual void handle_button( MackieButtonHandler & mbh, ButtonState bs, Button & button ) = 0;
@@ -117,11 +115,10 @@ public:
 
 protected:
 	virtual void init_controls() = 0;
-	virtual void init_strips( uint32_t max_strips, uint32_t unit_strips );
+	virtual void init_strips () {}
 
-private:
-	uint32_t _max_strips;
-	uint32_t _unit_strips;
+	const uint32_t _max_strips;
+	const uint32_t _unit_strips;
 };
 
 }