X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fsurfaces%2Fmackie%2Fcontrols.cc;h=bbe1029f30080389740991e4ebe46302cea936ae;hb=93d5fe83c8dfe794683b5009e78c390f28e6eca2;hp=42bcc3a09bdaa3081bc6f1cdccb5eb8096008a07;hpb=ad06e7cb8dd2add700d8a83c2b9cb7352d122bce;p=ardour.git

diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
index 42bcc3a09b..bbe1029f30 100644
--- a/libs/surfaces/mackie/controls.cc
+++ b/libs/surfaces/mackie/controls.cc
@@ -20,170 +20,39 @@
 #include <iomanip>
 #include <sstream>
 
+#include "ardour/automation_control.h"
+
 #include "controls.h"
 #include "types.h"
-#include "mackie_midi_builder.h"
 #include "surface.h"
+#include "control_group.h"
+#include "button.h"
+#include "led.h"
+#include "pot.h"
+#include "fader.h"
+#include "jog.h"
+#include "meter.h"
+
 
-using namespace Mackie;
 using namespace std;
+using namespace ArdourSurface;
+using namespace Mackie;
+
+using ARDOUR::AutomationControl;
 
 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)
+Control::Control (int id, std::string name, Group & group)
 	: _id (id)
-	, _ordinal (ordinal)
 	, _name (name)
 	, _group (group)
 	, _in_use (false)
 {
 }
 
-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;
-}
-
 /** @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.
@@ -202,106 +71,56 @@ Control::set_in_use (bool in_use)
 	_in_use = in_use;
 }
 
-ostream & Mackie::operator <<  (ostream & os, const Mackie::Control & control)
+void
+Control::set_control (boost::shared_ptr<AutomationControl> ac)
 {
-	os << typeid (control).name();
-	os << " { ";
-	os << "name: " << control.name();
-	os << ", ";
-	os << "id: " << "0x" << setw(4) << setfill('0') << hex << control.id() << setfill(' ');
-	os << ", ";
-	os << "type: " << "0x" << setw(2) << setfill('0') << hex << control.type() << setfill(' ');
-	os << ", ";
-	os << "raw_id: " << "0x" << setw(2) << setfill('0') << hex << control.raw_id() << setfill(' ');
-	os << ", ";
-	os << "ordinal: " << dec << control.ordinal();
-	os << ", ";
-	os << "group: " << control.group().name();
-	os << " }";
-	
-	return os;
+	normal_ac = ac;
 }
 
-std::ostream & Mackie::operator <<  (std::ostream & os, const Strip & strip)
+void
+Control::set_value (float val)
 {
-	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;
+	if (normal_ac) {
+		normal_ac->set_value (normal_ac->interface_to_internal (val));
+	}
 }
 
-Control*
-Button::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
+float
+Control::get_value ()
 {
-	Button* b = new Button (id, ordinal, name, group);
-	surface.buttons[id] = b;
-	surface.controls.push_back (b);
-	group.add (*b);
-	return b;
+	if (!normal_ac) {
+		return 0.0f;
+	}
+	return normal_ac->internal_to_interface (normal_ac->get_value());
 }
 
-Control*
-Fader::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
+void
+Control::start_touch (double when)
 {
-	Fader* f = new Fader (id, ordinal, name, group);
-	surface.faders[id] = f;
-	surface.controls.push_back (f);
-	group.add (*f);
-	return f;
+	if (normal_ac) {
+		return normal_ac->start_touch (when);
+	}
 }
 
-Control*
-Pot::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
+void
+Control::stop_touch (bool mark, double when)
 {
-	Pot* p = new Pot (id, ordinal, name, group);
-	surface.pots[id] = p;
-	surface.controls.push_back (p);
-	group.add (*p);
-	return p;
+	if (normal_ac) {
+		return normal_ac->stop_touch (mark, when);
+	}
 }
 
-Control*
-Led::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
+ostream & operator <<  (ostream & os, const ArdourSurface::Mackie::Control & control)
 {
-	Led* l = new Led (id, ordinal, name, group);
-	surface.leds[id] = l;
-	surface.controls.push_back (l);
-	group.add (*l);
-	return l;
-}
+	os << typeid (control).name();
+	os << " { ";
+	os << "name: " << control.name();
+	os << ", ";
+	os << "id: " << "0x" << setw(2) << setfill('0') << hex << control.id() << setfill(' ');
+	os << ", ";
+	os << "group: " << control.group().name();
+	os << " }";
 
-Control*
-Jog::factory (Surface& surface, int id, int ordinal, const char* name, Group& group)
-{
-	Jog* j = new Jog (id, ordinal, name, group);
-	surface.controls.push_back (j);
-	surface.controls_by_name["jog"] = j;
-	group.add (*j);
-	return j;
+	return os;
 }
 
-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;
-}