start breaking apart the various controls into their own headers and source code, and making each control know how to generate MIDI; throttle delivery of meter data and get meter ID right

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

1 files changed, 10 insertions, 184 deletions

diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
index d3d63efb85..fbd8a68d26 100644
--- a/libs/surfaces/mackie/controls.cc
+++ b/libs/surfaces/mackie/controls.cc
@@ -24,6 +24,16 @@
 #include "types.h"
 #include "mackie_midi_builder.h"
 #include "surface.h"
+#include "control_group.h"
+
+#include "button.h"
+#include "led.h"
+#include "ledring.h"
+#include "pot.h"
+#include "fader.h"
+#include "jog.h"
+#include "meter.h"
+
 
 using namespace Mackie;
 using namespace std;
@@ -33,77 +43,6 @@ void Group::add (Control& control)
 	_controls.push_back (&control);
 }
 
-Strip::Strip (const std::string& name, int index)
-	: Group (name)
-	, _solo (0)
-	, _recenable (0)
-	, _mute (0)
-	, _select (0)
-	, _vselect (0)
-	, _fader_touch (0)
-	, _vpot (0)
-	, _gain (0)
-	, _index (index)
-{
-	/* master strip only */
-}
-
-Strip::Strip (Surface& surface, const std::string& name, int index, int unit_index, StripControlDefinition* ctls)
-	: Group (name)
-	, _solo (0)
-	, _recenable (0)
-	, _mute (0)
-	, _select (0)
-	, _vselect (0)
-	, _fader_touch (0)
-	, _vpot (0)
-	, _gain (0)
-	, _index (index)
-{
-	/* build the controls for this track, which will automatically add them
-	   to the Group 
-	*/
-
-	for (uint32_t i = 0; ctls[i].name[0]; ++i) {
-		ctls[i].factory (surface, ctls[i].base_id + unit_index, unit_index+1, ctls[i].name, *this);
-	}
-}	
-
-/**
-	TODO could optimise this to use enum, but it's only
-	called during the protocol class instantiation.
-*/
-void Strip::add (Control & control)
-{
-	Group::add (control);
-
-	if  (control.name() == "gain") {
-		_gain = reinterpret_cast<Fader*>(&control);
-	} else if  (control.name() == "vpot") {
-		_vpot = reinterpret_cast<Pot*>(&control);
-	} else if  (control.name() == "recenable") {
-		_recenable = reinterpret_cast<Button*>(&control);
-	} else if  (control.name() == "solo") {
-		_solo = reinterpret_cast<Button*>(&control);
-	} else if  (control.name() == "mute") {
-		_mute = reinterpret_cast<Button*>(&control);
-	} else if  (control.name() == "select") {
-		_select = reinterpret_cast<Button*>(&control);
-	} else if  (control.name() == "vselect") {
-		_vselect = reinterpret_cast<Button*>(&control);
-	} else if  (control.name() == "fader_touch") {
-		_fader_touch = reinterpret_cast<Button*>(&control);
-	} else if  (control.name() == "meter") {
-		_meter = reinterpret_cast<Meter*>(&control);
-	} else if  (control.type() == Control::type_led || control.type() == Control::type_led_ring) {
-		// relax
-	} else {
-		ostringstream os;
-		os << "Strip::add: unknown control type " << control;
-		throw MackieControlException (os.str());
-	}
-}
-
 Control::Control (int id, int ordinal, std::string name, Group & group)
 	: _id (id)
 	, _ordinal (ordinal)
@@ -113,86 +52,6 @@ Control::Control (int id, int ordinal, std::string name, Group & group)
 {
 }
 
-Fader& 
-Strip::gain()
-{
-	if  (_gain == 0) {
-		throw MackieControlException ("gain is null");
-	}
-	return *_gain;
-}
-
-Pot& 
-Strip::vpot()
-{
-	if  (_vpot == 0) {
-		throw MackieControlException ("vpot is null");
-	}
-	return *_vpot;
-}
-
-Button& 
-Strip::recenable()
-{
-	if  (_recenable == 0) {
-		throw MackieControlException ("recenable is null");
-	}
-	return *_recenable;
-}
-
-Button& 
-Strip::solo()
-{
-	if  (_solo == 0) {
-		throw MackieControlException ("solo is null");
-	}
-	return *_solo;
-}
-Button& 
-Strip::mute()
-{
-	if  (_mute == 0) {
-		throw MackieControlException ("mute is null");
-	}
-	return *_mute;
-}
-
-Button& 
-Strip::select()
-{
-	if  (_select == 0) {
-		throw MackieControlException ("select is null");
-	}
-	return *_select;
-}
-
-Button& 
-Strip::vselect()
-{
-	if  (_vselect == 0) {
-		throw MackieControlException ("vselect is null");
-	}
-	return *_vselect;
-}
-
-Button& 
-Strip::fader_touch()
-{
-	if  (_fader_touch == 0) {
-		throw MackieControlException ("fader_touch is null");
-	}
-	return *_fader_touch;
-}
-
-Meter& 
-Strip::meter()
-{
-	if  (_meter == 0) {
-		throw MackieControlException ("meter is null");
-	}
-	return *_meter;
-}
-
 /** @return true if the control is in use, or false otherwise.
     Buttons are `in use' when they are held down.
     Faders with touch support are `in use' when they are being touched.
@@ -231,30 +90,6 @@ ostream & Mackie::operator <<  (ostream & os, const Mackie::Control & control)
 	return os;
 }
 
-std::ostream & Mackie::operator <<  (std::ostream & os, const Strip & strip)
-{
-	os << typeid (strip).name();
-	os << " { ";
-	os << "has_solo: " << boolalpha << strip.has_solo();
-	os << ", ";
-	os << "has_recenable: " << boolalpha << strip.has_recenable();
-	os << ", ";
-	os << "has_mute: " << boolalpha << strip.has_mute();
-	os << ", ";
-	os << "has_select: " << boolalpha << strip.has_select();
-	os << ", ";
-	os << "has_vselect: " << boolalpha << strip.has_vselect();
-	os << ", ";
-	os << "has_fader_touch: " << boolalpha << strip.has_fader_touch();
-	os << ", ";
-	os << "has_vpot: " << boolalpha << strip.has_vpot();
-	os << ", ";
-	os << "has_gain: " << boolalpha << strip.has_gain();
-	os << " }";
-	
-	return os;
-}
-
 Control*
 Button::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
 {
@@ -305,12 +140,3 @@ Jog::factory (Surface& surface, int id, int ordinal, const char* name, Group& gr
 	return j;
 }
 
-Control*
-Meter::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
-{
-	Meter* m = new Meter (id, ordinal, name, group);
-	surface.meters[id] = m;
-	surface.controls.push_back (m);
-	group.add (*m);
-	return m;
-}