new button IDs, one for MCP one for LCP, plus methods associated with them; SSL Nucleus now declares itself to be using Logic Control
git-svn-id: svn://localhost/ardour2/branches/3.0@11976 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
cc7d4db5fe
commit
65fe4f9edf
|
|
@ -102,7 +102,31 @@ public:
|
|||
Scrub,
|
||||
UserA,
|
||||
UserB,
|
||||
|
||||
Assign1,
|
||||
Assign2,
|
||||
Snapshot,
|
||||
Read,
|
||||
Write,
|
||||
FdrGroup,
|
||||
ClearSolo,
|
||||
Track,
|
||||
Send,
|
||||
MidiTracks,
|
||||
Inputs,
|
||||
AudioTracks,
|
||||
AudioInstruments,
|
||||
Aux,
|
||||
Busses,
|
||||
Outputs,
|
||||
User,
|
||||
Trim,
|
||||
Latch,
|
||||
Grp,
|
||||
Nudge,
|
||||
Drop,
|
||||
Replace,
|
||||
Click,
|
||||
|
||||
/* Strip buttons */
|
||||
|
||||
RecEnable,
|
||||
|
|
|
|||
|
|
@ -49,23 +49,36 @@ DeviceInfo::DeviceInfo()
|
|||
, _has_global_controls (true)
|
||||
, _has_jog_wheel (true)
|
||||
, _has_touch_sense_faders (true)
|
||||
, _uses_logic_control_buttons (false)
|
||||
, _name (X_("Mackie Control Universal Pro"))
|
||||
{
|
||||
mackie_control_buttons ();
|
||||
}
|
||||
|
||||
DeviceInfo::~DeviceInfo()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
DeviceInfo::mackie_control_buttons ()
|
||||
{
|
||||
_global_buttons.clear ();
|
||||
|
||||
/* these definitions are based on Mackie's specification for Mackie
|
||||
* Control Protocol.
|
||||
*
|
||||
* Any given device info file can override any or all of these for any reason.
|
||||
*/
|
||||
|
||||
_global_buttons[Button::IO] = GlobalButtonInfo ("io", "assignment", 0x28);
|
||||
_global_buttons[Button::Sends] = GlobalButtonInfo ("sends", "assignment", 0x29);
|
||||
_global_buttons[Button::Track] = GlobalButtonInfo ("track", "assignment", 0x28);
|
||||
_global_buttons[Button::Send] = GlobalButtonInfo ("send", "assignment", 0x29);
|
||||
_global_buttons[Button::Pan] = GlobalButtonInfo ("pan", "assignment", 0x2a);
|
||||
_global_buttons[Button::Plugin] = GlobalButtonInfo ("plugin", "assignment", 0x2b);
|
||||
_global_buttons[Button::Eq] = GlobalButtonInfo ("eq", "assignment", 0x2c);
|
||||
_global_buttons[Button::Dyn] = GlobalButtonInfo ("dyn", "assignment", 0x2d);
|
||||
_global_buttons[Button::Left] = GlobalButtonInfo ("left", "bank", 0x2e);
|
||||
_global_buttons[Button::Right] = GlobalButtonInfo ("right", "bank", 0x2f);
|
||||
_global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channel left", "bank", 0x30);
|
||||
_global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channelleft", "bank", 0x30);
|
||||
_global_buttons[Button::ChannelRight] = GlobalButtonInfo ("channelright", "bank", 0x31);
|
||||
_global_buttons[Button::Flip] = GlobalButtonInfo ("flip", "none", 0x32);
|
||||
_global_buttons[Button::Edit] = GlobalButtonInfo ("edit", "none", 0x33);
|
||||
|
|
@ -87,27 +100,114 @@ DeviceInfo::DeviceInfo()
|
|||
_global_buttons[Button::F14] = GlobalButtonInfo ("F14", "none", 0x43);
|
||||
_global_buttons[Button::F15] = GlobalButtonInfo ("F15", "none", 0x44);
|
||||
_global_buttons[Button::F16] = GlobalButtonInfo ("F16", "none", 0x45);
|
||||
_global_buttons[Button::Shift] = GlobalButtonInfo ("shift", "modifiers", 0x46);
|
||||
_global_buttons[Button::Ctrl] = GlobalButtonInfo ("ctrl", "modifiers", 0x46);
|
||||
_global_buttons[Button::Option] = GlobalButtonInfo ("option", "modifiers", 0x47);
|
||||
_global_buttons[Button::Ctrl] = GlobalButtonInfo ("control", "modifiers", 0x48);
|
||||
_global_buttons[Button::CmdAlt] = GlobalButtonInfo ("cmd_alt", "modifiers", 0x49);
|
||||
_global_buttons[Button::On] = GlobalButtonInfo ("on", "automation", 0x4a);
|
||||
_global_buttons[Button::RecReady] = GlobalButtonInfo ("rec_ready", "automation", 0x4b);
|
||||
_global_buttons[Button::Snapshot] = GlobalButtonInfo ("snapshot", "modifiers", 0x48);
|
||||
_global_buttons[Button::Shift] = GlobalButtonInfo ("shift", "modifiers", 0x49);
|
||||
_global_buttons[Button::Read] = GlobalButtonInfo ("read", "automation", 0x4a);
|
||||
_global_buttons[Button::Write] = GlobalButtonInfo ("write", "automation", 0x4b);
|
||||
_global_buttons[Button::Undo] = GlobalButtonInfo ("undo", "functions", 0x4c);
|
||||
_global_buttons[Button::Save] = GlobalButtonInfo ("save", "automation", 0x4d);
|
||||
_global_buttons[Button::Touch] = GlobalButtonInfo ("touch", "automation", 0x4e);
|
||||
_global_buttons[Button::Redo] = GlobalButtonInfo ("redo", "functions", 0x4f);
|
||||
_global_buttons[Button::Marker] = GlobalButtonInfo ("marker", "functions", 0x50);
|
||||
_global_buttons[Button::Enter] = GlobalButtonInfo ("enter", "functions", 0x51);
|
||||
_global_buttons[Button::FdrGroup] = GlobalButtonInfo ("fader group", "functions", 0x50);
|
||||
_global_buttons[Button::ClearSolo] = GlobalButtonInfo ("clear solo", "functions", 0x51);
|
||||
_global_buttons[Button::Cancel] = GlobalButtonInfo ("cancel", "functions", 0x52);
|
||||
_global_buttons[Button::Mixer] = GlobalButtonInfo ("mixer", "functions", 0x53);
|
||||
_global_buttons[Button::FrmLeft] = GlobalButtonInfo ("frm left", "transport", 0x54);
|
||||
_global_buttons[Button::FrmRight] = GlobalButtonInfo ("frm right", "transport", 0x55);
|
||||
_global_buttons[Button::Loop] = GlobalButtonInfo ("loop", "transport", 0x56);
|
||||
_global_buttons[Button::PunchIn] = GlobalButtonInfo ("punch in", "transport", 0x57);
|
||||
_global_buttons[Button::PunchOut] = GlobalButtonInfo ("punch out", "transport", 0x58);
|
||||
_global_buttons[Button::Home] = GlobalButtonInfo ("home", "transport", 0x59);
|
||||
_global_buttons[Button::End] = GlobalButtonInfo ("end", "transport", 0x5a);
|
||||
_global_buttons[Button::Marker] = GlobalButtonInfo ("marker", "functions", 0x53);
|
||||
_global_buttons[Button::Mixer] = GlobalButtonInfo ("mixer", "transport", 0x54);
|
||||
_global_buttons[Button::FrmLeft] = GlobalButtonInfo ("frm left", "transport", 0x55);
|
||||
_global_buttons[Button::FrmRight] = GlobalButtonInfo ("frm right", "transport", 0x56);
|
||||
_global_buttons[Button::End] = GlobalButtonInfo ("end", "transport", 0x57);
|
||||
_global_buttons[Button::PunchIn] = GlobalButtonInfo ("punch in", "transport", 0x58);
|
||||
_global_buttons[Button::PunchOut] = GlobalButtonInfo ("punch out", "transport", 0x59);
|
||||
_global_buttons[Button::Loop] = GlobalButtonInfo ("loop", "transport", 0x59);
|
||||
_global_buttons[Button::Home] = GlobalButtonInfo ("home", "transport", 0x5a);
|
||||
_global_buttons[Button::Rewind] = GlobalButtonInfo ("rewind", "transport", 0x5b);
|
||||
_global_buttons[Button::Ffwd] = GlobalButtonInfo ("ffwd", "transport", 0x5c);
|
||||
_global_buttons[Button::Stop] = GlobalButtonInfo ("stop", "transport", 0x5d);
|
||||
_global_buttons[Button::Play] = GlobalButtonInfo ("play", "transport", 0x5e);
|
||||
_global_buttons[Button::Record] = GlobalButtonInfo ("record", "transport", 0x5f);
|
||||
_global_buttons[Button::CursorUp] = GlobalButtonInfo ("cursor up", "cursor", 0x60);
|
||||
_global_buttons[Button::CursorDown] = GlobalButtonInfo ("cursor down", "cursor", 0x61);
|
||||
_global_buttons[Button::CursorLeft] = GlobalButtonInfo ("cursor left", "cursor", 0x62);
|
||||
_global_buttons[Button::CursorRight] = GlobalButtonInfo ("cursor right", "cursor", 0x63);
|
||||
_global_buttons[Button::Zoom] = GlobalButtonInfo ("zoom", "none", 0x64);
|
||||
_global_buttons[Button::Scrub] = GlobalButtonInfo ("scrub", "none", 0x65);
|
||||
_global_buttons[Button::UserA] = GlobalButtonInfo ("user a", "user", 0x66);
|
||||
_global_buttons[Button::UserB] = GlobalButtonInfo ("user b", "user", 0x67);
|
||||
|
||||
_strip_buttons[Button::RecEnable], StripButtonInfo (0x0, "recenable");
|
||||
_strip_buttons[Button::Solo] = StripButtonInfo (0x08, "solo");
|
||||
_strip_buttons[Button::Mute] = StripButtonInfo (0x10, "mute");
|
||||
_strip_buttons[Button::Select] = StripButtonInfo (0x18, "select");
|
||||
_strip_buttons[Button::VSelect] = StripButtonInfo (0x20, "vselect");
|
||||
_strip_buttons[Button::FaderTouch] = StripButtonInfo (0xe0, "fader touch");
|
||||
}
|
||||
|
||||
void
|
||||
DeviceInfo::logic_control_buttons ()
|
||||
{
|
||||
_global_buttons.clear ();
|
||||
|
||||
/* these definitions are based on Mackie's specification for Mackie
|
||||
* Control Protocol, Logic Control "variant" and corroborated
|
||||
* with Apple's Logic Control manual.
|
||||
*
|
||||
* Any given device info file can override any or all of these for any reason.
|
||||
*/
|
||||
|
||||
_global_buttons[Button::Track] = GlobalButtonInfo ("track", "assignment", 0x2a);
|
||||
_global_buttons[Button::Send] = GlobalButtonInfo ("send", "assignment", 0x2b);
|
||||
_global_buttons[Button::Pan] = GlobalButtonInfo ("pan", "assignment", 0x2a);
|
||||
_global_buttons[Button::Plugin] = GlobalButtonInfo ("plugin", "assignment", 0x2b);
|
||||
_global_buttons[Button::Eq] = GlobalButtonInfo ("eq", "assignment", 0x2c);
|
||||
_global_buttons[Button::Dyn] = GlobalButtonInfo ("dyn", "assignment", 0x2d);
|
||||
_global_buttons[Button::Left] = GlobalButtonInfo ("left", "bank", 0x2e);
|
||||
_global_buttons[Button::Right] = GlobalButtonInfo ("right", "bank", 0x2f);
|
||||
_global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channel left", "bank", 0x30);
|
||||
_global_buttons[Button::ChannelRight] = GlobalButtonInfo ("channelright", "bank", 0x31);
|
||||
_global_buttons[Button::Flip] = GlobalButtonInfo ("flip", "none", 0x32);
|
||||
_global_buttons[Button::Edit] = GlobalButtonInfo ("edit", "none", 0x33);
|
||||
_global_buttons[Button::NameValue] = GlobalButtonInfo ("name/value", "display", 0x34);
|
||||
_global_buttons[Button::TimecodeBeats] = GlobalButtonInfo ("timecode/beats", "display", 0x35);
|
||||
_global_buttons[Button::F1] = GlobalButtonInfo ("F1", "none", 0x36);
|
||||
_global_buttons[Button::F2] = GlobalButtonInfo ("F2", "none", 0x37);
|
||||
_global_buttons[Button::F3] = GlobalButtonInfo ("F3", "none", 0x38);
|
||||
_global_buttons[Button::F4] = GlobalButtonInfo ("F4", "none", 0x39);
|
||||
_global_buttons[Button::F5] = GlobalButtonInfo ("F5", "none", 0x3a);
|
||||
_global_buttons[Button::F6] = GlobalButtonInfo ("F6", "none", 0x3b);
|
||||
_global_buttons[Button::F7] = GlobalButtonInfo ("F7", "none", 0x3c);
|
||||
_global_buttons[Button::F8] = GlobalButtonInfo ("F8", "none", 0x3d);
|
||||
/**/
|
||||
_global_buttons[Button::MidiTracks] = GlobalButtonInfo ("miditracks", "view", 0x3e);
|
||||
_global_buttons[Button::Inputs] = GlobalButtonInfo ("inputs", "view", 0x3f);
|
||||
_global_buttons[Button::AudioTracks] = GlobalButtonInfo ("audiotracks", "view", 0x40);
|
||||
_global_buttons[Button::AudioInstruments] = GlobalButtonInfo ("audio instruments", "view", 0x41);
|
||||
_global_buttons[Button::Aux] = GlobalButtonInfo ("aux", "view", 0x42);
|
||||
_global_buttons[Button::Busses] = GlobalButtonInfo ("busses", "view", 0x43);
|
||||
_global_buttons[Button::Outputs] = GlobalButtonInfo ("outputs", "view", 0x44);
|
||||
_global_buttons[Button::User] = GlobalButtonInfo ("user_ready", "view", 0x45);
|
||||
_global_buttons[Button::Shift] = GlobalButtonInfo ("ctrl", "modifiers", 0x46);
|
||||
_global_buttons[Button::Option] = GlobalButtonInfo ("option", "modifiers", 0x47);
|
||||
_global_buttons[Button::Ctrl] = GlobalButtonInfo ("snapshot", "modifiers", 0x48);
|
||||
_global_buttons[Button::CmdAlt] = GlobalButtonInfo ("shift", "modifiers", 0x49);
|
||||
_global_buttons[Button::Read] = GlobalButtonInfo ("read", "automation", 0x4a);
|
||||
_global_buttons[Button::Write] = GlobalButtonInfo ("write", "automation", 0x4b);
|
||||
_global_buttons[Button::Trim] = GlobalButtonInfo ("trim", "automation", 0x4c);
|
||||
_global_buttons[Button::Touch] = GlobalButtonInfo ("touch", "functions", 0x4d);
|
||||
_global_buttons[Button::Latch] = GlobalButtonInfo ("latch", "functions", 0x4e);
|
||||
_global_buttons[Button::Grp] = GlobalButtonInfo ("group", "functions", 0x4f);
|
||||
_global_buttons[Button::Save] = GlobalButtonInfo ("save", "functions", 0x50);
|
||||
_global_buttons[Button::Undo] = GlobalButtonInfo ("undo", "functions", 0x51);
|
||||
_global_buttons[Button::Cancel] = GlobalButtonInfo ("cancel", "transport", 0x52);
|
||||
_global_buttons[Button::Enter] = GlobalButtonInfo ("enter right", "transport", 0x53);
|
||||
_global_buttons[Button::Marker] = GlobalButtonInfo ("marker", "transport", 0x54);
|
||||
_global_buttons[Button::Nudge] = GlobalButtonInfo ("nudge", "transport", 0x55);
|
||||
_global_buttons[Button::Loop] = GlobalButtonInfo ("cycle", "transport", 0x56);
|
||||
_global_buttons[Button::Drop] = GlobalButtonInfo ("drop", "transport", 0x57);
|
||||
_global_buttons[Button::Replace] = GlobalButtonInfo ("replace", "transport", 0x58);
|
||||
_global_buttons[Button::Click] = GlobalButtonInfo ("click", "transport", 0x59);
|
||||
_global_buttons[Button::Solo] = GlobalButtonInfo ("solo", "transport", 0x5a);
|
||||
_global_buttons[Button::Rewind] = GlobalButtonInfo ("rewind", "transport", 0x5b);
|
||||
_global_buttons[Button::Ffwd] = GlobalButtonInfo ("ffwd", "transport", 0x5c);
|
||||
_global_buttons[Button::Stop] = GlobalButtonInfo ("stop", "transport", 0x5d);
|
||||
|
|
@ -130,10 +230,6 @@ DeviceInfo::DeviceInfo()
|
|||
_strip_buttons[Button::FaderTouch] = StripButtonInfo (0x68, "fader touch");
|
||||
}
|
||||
|
||||
DeviceInfo::~DeviceInfo()
|
||||
{
|
||||
}
|
||||
|
||||
int
|
||||
DeviceInfo::set_state (const XMLNode& node, int /* version */)
|
||||
{
|
||||
|
|
@ -211,6 +307,19 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
|
|||
_has_touch_sense_faders = string_is_affirmative (prop->value());
|
||||
}
|
||||
}
|
||||
|
||||
if ((child = node.child ("LogicControlButtons")) != 0) {
|
||||
if ((prop = child->property ("value")) != 0) {
|
||||
_uses_logic_control_buttons = string_is_affirmative (prop->value());
|
||||
|
||||
if (_uses_logic_control_buttons) {
|
||||
logic_control_buttons();
|
||||
} else {
|
||||
mackie_control_buttons ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((child = node.child ("Buttons")) != 0) {
|
||||
XMLNodeConstIterator i;
|
||||
const XMLNodeList& nlist (child->children());
|
||||
|
|
|
|||
|
|
@ -76,19 +76,23 @@ class DeviceInfo
|
|||
const std::map<Button::ID,StripButtonInfo>& strip_buttons() const { return _strip_buttons; }
|
||||
|
||||
private:
|
||||
uint32_t _strip_cnt;
|
||||
uint32_t _extenders;
|
||||
bool _has_two_character_display;
|
||||
bool _has_master_fader;
|
||||
bool _has_segmented_display;
|
||||
bool _has_timecode_display;
|
||||
bool _has_global_controls;
|
||||
bool _has_jog_wheel;
|
||||
bool _has_touch_sense_faders;
|
||||
std::string _name;
|
||||
uint32_t _strip_cnt;
|
||||
uint32_t _extenders;
|
||||
bool _has_two_character_display;
|
||||
bool _has_master_fader;
|
||||
bool _has_segmented_display;
|
||||
bool _has_timecode_display;
|
||||
bool _has_global_controls;
|
||||
bool _has_jog_wheel;
|
||||
bool _has_touch_sense_faders;
|
||||
bool _uses_logic_control_buttons;
|
||||
std::string _name;
|
||||
|
||||
std::map<Button::ID,GlobalButtonInfo> _global_buttons;
|
||||
std::map<Button::ID,StripButtonInfo> _strip_buttons;
|
||||
|
||||
void logic_control_buttons ();
|
||||
void mackie_control_buttons ();
|
||||
};
|
||||
|
||||
class DeviceProfile
|
||||
|
|
|
|||
|
|
@ -975,6 +975,9 @@ MackieControlProtocol::update_led (Surface& surface, Button& button, Mackie::Led
|
|||
void
|
||||
MackieControlProtocol::build_button_map ()
|
||||
{
|
||||
/* this maps our device-independent button codes to the methods that handle them.
|
||||
*/
|
||||
|
||||
#define DEFINE_BUTTON_HANDLER(b,p,r) button_map.insert (pair<Button::ID,ButtonHandlers> ((b), ButtonHandlers ((p),(r))));
|
||||
|
||||
DEFINE_BUTTON_HANDLER (Button::IO, &MackieControlProtocol::io_press, &MackieControlProtocol::io_release);
|
||||
|
|
@ -1041,6 +1044,29 @@ MackieControlProtocol::build_button_map ()
|
|||
DEFINE_BUTTON_HANDLER (Button::Scrub, &MackieControlProtocol::scrub_press, &MackieControlProtocol::scrub_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::UserA, &MackieControlProtocol::user_a_press, &MackieControlProtocol::user_a_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::UserB, &MackieControlProtocol::user_b_press, &MackieControlProtocol::user_b_release);
|
||||
|
||||
DEFINE_BUTTON_HANDLER (Button::Snapshot, &MackieControlProtocol::snapshot_press, &MackieControlProtocol::snapshot_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Read, &MackieControlProtocol::read_press, &MackieControlProtocol::read_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Write, &MackieControlProtocol::write_press, &MackieControlProtocol::write_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::FdrGroup, &MackieControlProtocol::fdrgroup_press, &MackieControlProtocol::fdrgroup_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::ClearSolo, &MackieControlProtocol::clearsolo_press, &MackieControlProtocol::clearsolo_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Track, &MackieControlProtocol::track_press, &MackieControlProtocol::track_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Send, &MackieControlProtocol::send_press, &MackieControlProtocol::send_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::MidiTracks, &MackieControlProtocol::miditracks_press, &MackieControlProtocol::miditracks_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Inputs, &MackieControlProtocol::inputs_press, &MackieControlProtocol::inputs_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::AudioTracks, &MackieControlProtocol::audiotracks_press, &MackieControlProtocol::audiotracks_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::AudioInstruments, &MackieControlProtocol::audioinstruments_press, &MackieControlProtocol::audioinstruments_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Aux, &MackieControlProtocol::aux_press, &MackieControlProtocol::aux_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Busses, &MackieControlProtocol::busses_press, &MackieControlProtocol::busses_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Outputs, &MackieControlProtocol::outputs_press, &MackieControlProtocol::outputs_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::User, &MackieControlProtocol::user_press, &MackieControlProtocol::user_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Trim, &MackieControlProtocol::trim_press, &MackieControlProtocol::trim_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Latch, &MackieControlProtocol::latch_press, &MackieControlProtocol::latch_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Grp, &MackieControlProtocol::grp_press, &MackieControlProtocol::grp_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Nudge, &MackieControlProtocol::nudge_press, &MackieControlProtocol::nudge_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Drop, &MackieControlProtocol::drop_press, &MackieControlProtocol::drop_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Replace, &MackieControlProtocol::replace_press, &MackieControlProtocol::replace_release);
|
||||
DEFINE_BUTTON_HANDLER (Button::Click, &MackieControlProtocol::click_press, &MackieControlProtocol::click_release);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1071,7 +1097,10 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
|
|||
break;
|
||||
}
|
||||
} else {
|
||||
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button handlers for ID %1\n", button.id()));
|
||||
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button handlers for button ID %1 (device ID %2)\n",
|
||||
button.bid(), button.id()));
|
||||
error << string_compose ("no button handlers for button ID %1 (device ID %2)\n",
|
||||
button.bid(), button.id()) << endmsg;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -351,8 +351,6 @@ class MackieControlProtocol
|
|||
Mackie::LedState global_solo_release(Mackie::Button &);
|
||||
Mackie::LedState marker_press(Mackie::Button &);
|
||||
Mackie::LedState marker_release(Mackie::Button &);
|
||||
Mackie::LedState drop_press(Mackie::Button &);
|
||||
Mackie::LedState drop_release(Mackie::Button &);
|
||||
Mackie::LedState save_press(Mackie::Button &);
|
||||
Mackie::LedState save_release(Mackie::Button &);
|
||||
Mackie::LedState timecode_beats_press(Mackie::Button &);
|
||||
|
|
@ -428,8 +426,6 @@ class MackieControlProtocol
|
|||
Mackie::LedState on_release (Mackie::Button &);
|
||||
Mackie::LedState rec_ready_press (Mackie::Button &);
|
||||
Mackie::LedState rec_ready_release (Mackie::Button &);
|
||||
Mackie::LedState snapshot_press (Mackie::Button &);
|
||||
Mackie::LedState snapshot_release (Mackie::Button &);
|
||||
Mackie::LedState touch_press (Mackie::Button &);
|
||||
Mackie::LedState touch_release (Mackie::Button &);
|
||||
Mackie::LedState enter_press (Mackie::Button &);
|
||||
|
|
@ -444,6 +440,52 @@ class MackieControlProtocol
|
|||
Mackie::LedState user_b_release (Mackie::Button &);
|
||||
Mackie::LedState fader_touch_press (Mackie::Button &);
|
||||
Mackie::LedState fader_touch_release (Mackie::Button &);
|
||||
|
||||
Mackie::LedState snapshot_press (Mackie::Button&);
|
||||
Mackie::LedState snapshot_release (Mackie::Button&);
|
||||
Mackie::LedState read_press (Mackie::Button&);
|
||||
Mackie::LedState read_release (Mackie::Button&);
|
||||
Mackie::LedState write_press (Mackie::Button&);
|
||||
Mackie::LedState write_release (Mackie::Button&);
|
||||
Mackie::LedState fdrgroup_press (Mackie::Button&);
|
||||
Mackie::LedState fdrgroup_release (Mackie::Button&);
|
||||
Mackie::LedState clearsolo_press (Mackie::Button&);
|
||||
Mackie::LedState clearsolo_release (Mackie::Button&);
|
||||
Mackie::LedState track_press (Mackie::Button&);
|
||||
Mackie::LedState track_release (Mackie::Button&);
|
||||
Mackie::LedState send_press (Mackie::Button&);
|
||||
Mackie::LedState send_release (Mackie::Button&);
|
||||
Mackie::LedState miditracks_press (Mackie::Button&);
|
||||
Mackie::LedState miditracks_release (Mackie::Button&);
|
||||
Mackie::LedState inputs_press (Mackie::Button&);
|
||||
Mackie::LedState inputs_release (Mackie::Button&);
|
||||
Mackie::LedState audiotracks_press (Mackie::Button&);
|
||||
Mackie::LedState audiotracks_release (Mackie::Button&);
|
||||
Mackie::LedState audioinstruments_press (Mackie::Button&);
|
||||
Mackie::LedState audioinstruments_release (Mackie::Button&);
|
||||
Mackie::LedState aux_press (Mackie::Button&);
|
||||
Mackie::LedState aux_release (Mackie::Button&);
|
||||
Mackie::LedState busses_press (Mackie::Button&);
|
||||
Mackie::LedState busses_release (Mackie::Button&);
|
||||
Mackie::LedState outputs_press (Mackie::Button&);
|
||||
Mackie::LedState outputs_release (Mackie::Button&);
|
||||
Mackie::LedState user_press (Mackie::Button&);
|
||||
Mackie::LedState user_release (Mackie::Button&);
|
||||
Mackie::LedState trim_press (Mackie::Button&);
|
||||
Mackie::LedState trim_release (Mackie::Button&);
|
||||
Mackie::LedState latch_press (Mackie::Button&);
|
||||
Mackie::LedState latch_release (Mackie::Button&);
|
||||
Mackie::LedState grp_press (Mackie::Button&);
|
||||
Mackie::LedState grp_release (Mackie::Button&);
|
||||
Mackie::LedState nudge_press (Mackie::Button&);
|
||||
Mackie::LedState nudge_release (Mackie::Button&);
|
||||
Mackie::LedState drop_press (Mackie::Button&);
|
||||
Mackie::LedState drop_release (Mackie::Button&);
|
||||
Mackie::LedState replace_press (Mackie::Button&);
|
||||
Mackie::LedState replace_release (Mackie::Button&);
|
||||
Mackie::LedState click_press (Mackie::Button&);
|
||||
Mackie::LedState click_release (Mackie::Button&);
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1000,3 +1000,214 @@ MackieControlProtocol::user_b_release (Button &)
|
|||
{
|
||||
return off;
|
||||
}
|
||||
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::snapshot_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::snapshot_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::read_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::read_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::write_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::write_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::fdrgroup_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::fdrgroup_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::clearsolo_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::clearsolo_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::track_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::track_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::send_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::send_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::miditracks_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::miditracks_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::inputs_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::inputs_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::audiotracks_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::audiotracks_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::audioinstruments_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::audioinstruments_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::aux_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::aux_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::busses_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::busses_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::outputs_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::outputs_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::user_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::user_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::trim_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::trim_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::latch_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::latch_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::grp_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::grp_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::nudge_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::nudge_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::replace_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::replace_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::click_press (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
Mackie::LedState
|
||||
MackieControlProtocol::click_release (Mackie::Button&)
|
||||
{
|
||||
return none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,6 +166,7 @@ Surface::init_controls()
|
|||
groups["transport"] = new Group ("transport");
|
||||
groups["user"] = new Group ("user");
|
||||
groups["master"] = new Group ("master");
|
||||
groups["view"] = new Group ("view");
|
||||
|
||||
if (_mcp.device_info().has_jog_wheel()) {
|
||||
_jog_wheel = new Mackie::JogWheel (_mcp);
|
||||
|
|
|
|||
|
|
@ -10,12 +10,5 @@
|
|||
<GlobalControls value="yes"/>
|
||||
<JogWheel value="yes"/>
|
||||
<TouchSenseFaders value="yes"/>
|
||||
<SendsModifiers value="0x3"/>
|
||||
<Quirks>
|
||||
<ButtonOffNonZero/>
|
||||
</Quirks>
|
||||
<Buttons>
|
||||
<GlobalButton name="Marker" id="0x48" label="instrument"/>
|
||||
<StripButton name="FaderTouch" baseid="0x68"/>
|
||||
</Buttons>
|
||||
<LogicControlButtons/>
|
||||
</MackieProtocolDevice>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user