X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fcontrols.cc;h=972a28cb0df0546877ea06daaec12174599ec8d8;hb=7c9c4d6dc746604eac95d0ee767a9b9f2795366e;hp=42bcc3a09bdaa3081bc6f1cdccb5eb8096008a07;hpb=ad06e7cb8dd2add700d8a83c2b9cb7352d122bce;p=ardour.git diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc index 42bcc3a09b..972a28cb0d 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,157 +43,14 @@ 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(&control); - } else if (control.name() == "vpot") { - _vpot = reinterpret_cast(&control); - } else if (control.name() == "recenable") { - _recenable = reinterpret_cast(&control); - } else if (control.name() == "solo") { - _solo = reinterpret_cast(&control); - } else if (control.name() == "mute") { - _mute = reinterpret_cast(&control); - } else if (control.name() == "select") { - _select = reinterpret_cast(&control); - } else if (control.name() == "vselect") { - _vselect = reinterpret_cast(&control); - } else if (control.name() == "fader_touch") { - _fader_touch = reinterpret_cast(&control); - } else if (control.name() == "meter") { - _meter = reinterpret_cast(&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. @@ -214,62 +81,16 @@ ostream & Mackie::operator << (ostream & os, const Mackie::Control & control) 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; } -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) -{ - Button* b = new Button (id, ordinal, name, group); - surface.buttons[id] = b; - surface.controls.push_back (b); - group.add (*b); - return b; -} - -Control* -Fader::factory (Surface& surface, int id, int ordinal, const char* name, Group& group) -{ - Fader* f = new Fader (id, ordinal, name, group); - surface.faders[id] = f; - surface.controls.push_back (f); - group.add (*f); - return f; -} - Control* -Pot::factory (Surface& surface, int id, int ordinal, const char* name, Group& group) +Pot::factory (Surface& surface, int id, const char* name, Group& group) { - Pot* p = new Pot (id, ordinal, name, group); + Pot* p = new Pot (id, name, group); surface.pots[id] = p; surface.controls.push_back (p); group.add (*p); @@ -277,31 +98,12 @@ Pot::factory (Surface& surface, int id, int ordinal, const char* name, Group& gr } Control* -Led::factory (Surface& surface, int id, int ordinal, const char* name, Group& group) -{ - Led* l = new Led (id, ordinal, name, group); - surface.leds[id] = l; - surface.controls.push_back (l); - group.add (*l); - return l; -} - -Control* -Jog::factory (Surface& surface, int id, int ordinal, const char* name, Group& group) +Jog::factory (Surface& surface, int id, const char* name, Group& group) { - Jog* j = new Jog (id, ordinal, name, group); + Jog* j = new Jog (id, name, group); surface.controls.push_back (j); surface.controls_by_name["jog"] = j; group.add (*j); 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; -}