X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fsurface.cc;h=694c73b1bcb638f49bb3772bceeb6a55159f33cb;hb=316973d7c7bc99bfef6367d42009883d0de2abbd;hp=52323ee8a666163f619042653b465ccd69e4419f;hpb=b9ff443085b0513d95c867cce81595b9509b2dff;p=ardour.git diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 52323ee8a6..694c73b1bc 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -1,3 +1,22 @@ +/* + Copyright (C) 2012 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #include #include #include @@ -5,7 +24,6 @@ #include #include "midi++/port.h" -#include "midi++/manager.h" #include "ardour/automation_control.h" #include "ardour/debug.h" @@ -14,13 +32,14 @@ #include "ardour/panner_shell.h" #include "ardour/rc_configuration.h" #include "ardour/session.h" +#include "ardour/utils.h" #include "control_group.h" #include "surface_port.h" #include "surface.h" #include "strip.h" #include "mackie_control_protocol.h" -#include "mackie_jog_wheel.h" +#include "jog_wheel.h" #include "strip.h" #include "button.h" @@ -41,9 +60,6 @@ using ARDOUR::Pannable; using ARDOUR::AutomationControl; #define ui_context() MackieControlProtocol::instance() /* a UICallback-derived object that specifies the event loop for signal handling */ -#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__)) -extern PBD::EventLoop::InvalidationRecord* __invalidator (sigc::trackable& trackable, const char*, int); -#define invalidator() __invalidator (*(MackieControlProtocol::instance()), __FILE__, __LINE__) // The MCU sysex header.4th byte Will be overwritten // when we get an incoming sysex that identifies @@ -62,23 +78,32 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui , _stype (stype) , _number (number) , _name (device_name) - , _active (true) + , _active (false) , _connected (false) , _jog_wheel (0) + , _master_fader (0) + , _last_master_gain_written (-0.0f) { - DEBUG_TRACE (DEBUG::MackieControl, "Surface::init\n"); + DEBUG_TRACE (DEBUG::MackieControl, "Surface::Surface init\n"); - _port = new SurfacePort (*this); + try { + _port = new SurfacePort (*this); + } catch (...) { + throw failed_constructor (); + } /* only the first Surface object has global controls */ if (_number == 0) { + DEBUG_TRACE (DEBUG::MackieControl, "Surface is first. Might have global controls.\n"); if (_mcp.device_info().has_global_controls()) { init_controls (); + DEBUG_TRACE (DEBUG::MackieControl, "init_controls done\n"); } if (_mcp.device_info().has_master_fader()) { setup_master (); + DEBUG_TRACE (DEBUG::MackieControl, "setup_master done\n"); } } @@ -86,34 +111,19 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui if (n) { init_strips (n); + DEBUG_TRACE (DEBUG::MackieControl, "init_strips done\n"); } connect_to_signals (); - /* wakey wakey */ - - MidiByteArray wakeup (7, MIDI::sysex, 0x00, 0x00, 0x66, 0x14, 0x00, MIDI::eox); - _port->write (wakeup); - wakeup[4] = 0x15; /* wakup Mackie XT */ - _port->write (wakeup); - wakeup[4] = 0x10; /* wakupe Logic Control */ - _port->write (wakeup); - wakeup[4] = 0x11; /* wakeup Logic Control XT */ - _port->write (wakeup); - - DEBUG_TRACE (DEBUG::MackieControl, "Surface::init finish\n"); + DEBUG_TRACE (DEBUG::MackieControl, "Surface::Surface done\n"); } Surface::~Surface () { - DEBUG_TRACE (DEBUG::MackieControl, "Surface: destructor\n"); + DEBUG_TRACE (DEBUG::MackieControl, "Surface::~Surface init\n"); - // faders to minimum - write_sysex (0x61); - // All LEDs off - write_sysex (0x62); - // Reset (reboot into offline mode) - // _write_sysex (0x63); + zero_all (); // delete groups for (Groups::iterator it = groups.begin(); it != groups.end(); ++it) { @@ -127,6 +137,41 @@ Surface::~Surface () delete _jog_wheel; delete _port; + + DEBUG_TRACE (DEBUG::MackieControl, "Surface::~Surface done\n"); +} + +XMLNode& +Surface::get_state() +{ + char buf[64]; + snprintf (buf, sizeof (buf), X_("surface-%u"), _number); + XMLNode* node = new XMLNode (buf); + + node->add_child_nocopy (_port->get_state()); + + return *node; +} + +int +Surface::set_state (const XMLNode& node, int version) +{ + char buf[64]; + snprintf (buf, sizeof (buf), X_("surface-%u"), _number); + XMLNode* mynode = node.child (buf); + + if (!mynode) { + return 0; + } + + XMLNode* portnode = mynode->child (X_("Port")); + if (portnode) { + if (_port->set_state (*portnode, version)) { + return -1; + } + } + + return 0; } const MidiByteArray& @@ -154,24 +199,28 @@ void Surface::init_controls() { Group* group; - + + DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: creating groups\n"); groups["assignment"] = new Group ("assignment"); groups["automation"] = new Group ("automation"); groups["bank"] = new Group ("bank"); groups["cursor"] = new Group ("cursor"); groups["display"] = new Group ("display"); - groups["functions"] = new Group ("functions"); + groups["function select"] = new Group ("function select"); + groups["global view"] = new Group ("global view"); + groups["master"] = new Group ("master"); groups["modifiers"] = new Group ("modifiers"); groups["none"] = new Group ("none"); groups["transport"] = new Group ("transport"); groups["user"] = new Group ("user"); - groups["master"] = new Group ("master"); - groups["view"] = new Group ("view"); + groups["utilities"] = new Group ("utilities"); + DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: creating jog wheel\n"); if (_mcp.device_info().has_jog_wheel()) { _jog_wheel = new Mackie::JogWheel (_mcp); } + DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: creating global controls\n"); for (uint32_t n = 0; mackie_global_controls[n].name[0]; ++n) { group = groups[mackie_global_controls[n].group_name]; Control* control = mackie_global_controls[n].factory (*this, mackie_global_controls[n].id, mackie_global_controls[n].name, *group); @@ -179,7 +228,7 @@ Surface::init_controls() } /* add global buttons */ - + DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: adding global buttons\n"); const map& global_buttons (_mcp.device_info().global_buttons()); for (map::const_iterator b = global_buttons.begin(); b != global_buttons.end(); ++b){ @@ -199,8 +248,6 @@ Surface::init_strips (uint32_t n) snprintf (name, sizeof (name), "strip_%d", (8* _number) + i); - std::cerr << "*** Surface " << _number << " Setup strips for index " << i << endl; - Strip* strip = new Strip (*this, name, i, strip_buttons); groups[name] = strip; @@ -211,8 +258,6 @@ Surface::init_strips (uint32_t n) void Surface::setup_master () { - _master_fader = dynamic_cast (Fader::factory (*this, 8, "master", *groups["master"])); - boost::shared_ptr m; if ((m = _mcp.get_session().monitor_out()) == 0) { @@ -222,24 +267,58 @@ Surface::setup_master () if (!m) { return; } + + _master_fader = dynamic_cast (Fader::factory (*this, _mcp.device_info().strip_cnt(), "master", *groups["master"])); _master_fader->set_control (m->gain_control()); - m->gain_control()->Changed.connect (*this, invalidator(), ui_bind (&Surface::master_gain_changed, this), ui_context()); + m->gain_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&Surface::master_gain_changed, this), ui_context()); + + Groups::iterator group_it; + group_it = groups.find("master"); + + DeviceInfo device_info = _mcp.device_info(); + GlobalButtonInfo master_button = device_info.get_global_button(Button::MasterFaderTouch); + Button* bb = dynamic_cast (Button::factory ( + *this, + Button::MasterFaderTouch, + master_button.id, + master_button.label, + *(group_it->second) +)); + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 Master Fader new button BID %2 id %3\n", + number(), Button::MasterFaderTouch, bb->id())); } void Surface::master_gain_changed () { + if (!_master_fader) { + return; + } + boost::shared_ptr ac = _master_fader->control(); - float pos = ac->internal_to_interface (ac->get_value()); - _port->write (_master_fader->set_position (pos)); + if (!ac) { + return; + } + + float normalized_position = ac->internal_to_interface (ac->get_value()); + if (normalized_position == _last_master_gain_written) { + return; + } + + DEBUG_TRACE (DEBUG::MackieControl, "Surface::master_gain_changed: updating surface master fader\n"); + + _port->write (_master_fader->set_position (normalized_position)); + _last_master_gain_written = normalized_position; } float Surface::scaled_delta (float delta, float current_speed) { /* XXX needs work before use */ - return (std::pow (float(delta + 1), 2) + current_speed) / 100.0; + const float sign = delta < 0.0 ? -1.0 : 1.0; + + return ((sign * std::pow (delta + 1.0, 2.0)) + current_speed) / 100.0; } void @@ -247,10 +326,10 @@ Surface::display_bank_start (uint32_t current_bank) { if (current_bank == 0) { // send Ar. to 2-char display on the master - _port->write (two_char_display ("Ar", "..")); + show_two_char_display ("Ar", ".."); } else { // write the current first remote_id to the 2-char display - _port->write (two_char_display (current_bank)); + show_two_char_display (current_bank); } } @@ -262,17 +341,11 @@ Surface::blank_jog_ring () if (control) { Pot* pot = dynamic_cast (control); if (pot) { - _port->write (pot->set_onoff (false)); + _port->write (pot->set (0.0, false, Pot::spread)); } } } -bool -Surface::has_timecode_display () const -{ - return false; -} - float Surface::scrub_scaling_factor () const { @@ -299,14 +372,12 @@ Surface::connect_to_signals () /* Button messages are NoteOn. libmidi++ sends note-on w/velocity = 0 as note-off so catch them too */ p->note_off.connect_same_thread (*this, boost::bind (&Surface::handle_midi_note_on_message, this, _1, _2)); /* Fader messages are Pitchbend */ - p->channel_pitchbend[0].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 0U)); - p->channel_pitchbend[1].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 1U)); - p->channel_pitchbend[2].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 2U)); - p->channel_pitchbend[3].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 3U)); - p->channel_pitchbend[4].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 4U)); - p->channel_pitchbend[5].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 5U)); - p->channel_pitchbend[6].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 6U)); - p->channel_pitchbend[7].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, 7U)); + uint32_t i; + for (i = 0; i < _mcp.device_info().strip_cnt(); i++) { + p->channel_pitchbend[i].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, i)); + } + // Master fader + p->channel_pitchbend[_mcp.device_info().strip_cnt()].connect_same_thread (*this, boost::bind (&Surface::handle_midi_pitchbend_message, this, _1, _2, _mcp.device_info().strip_cnt())); _connected = true; } @@ -323,9 +394,14 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin * when we connected to the per-channel pitchbend events. */ - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("handle_midi pitchbend on port %3, fader = %1 value = %2\n", + + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface::handle_midi_pitchbend_message on port %3, fader = %1 value = %2\n", fader_id, pb, _number)); + if (_mcp.device_info().no_handshake()) { + turn_it_on (); + } + Fader* fader = faders[fader_id]; if (fader) { @@ -334,6 +410,7 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin if (strip) { strip->handle_fader (*fader, pos); } else { + DEBUG_TRACE (DEBUG::MackieControl, "Handling master fader\n"); /* master fader */ fader->set_value (pos); // alter master gain _port->write (fader->set_position (pos)); // write back value (required for servo) @@ -346,8 +423,12 @@ Surface::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb, uin void Surface::handle_midi_note_on_message (MIDI::Parser &, MIDI::EventTwoBytes* ev) { - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("SurfacePort::handle_note_on %1 = %2\n", (int) ev->note_number, (int) ev->velocity)); + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface::handle_midi_note_on_message %1 = %2\n", (int) ev->note_number, (int) ev->velocity)); + if (_mcp.device_info().no_handshake()) { + turn_it_on (); + } + Button* button = buttons[ev->note_number]; if (button) { @@ -363,7 +444,7 @@ Surface::handle_midi_note_on_message (MIDI::Parser &, MIDI::EventTwoBytes* ev) _mcp.handle_button_event (*this, *button, ev->velocity > 64 ? press : release); } } else { - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button found for %1\n", ev->note_number)); + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button found for %1\n", (int) ev->note_number)); } } @@ -372,41 +453,40 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("SurfacePort::handle_midi_controller %1 = %2\n", (int) ev->controller_number, (int) ev->value)); - Pot* pot = pots[ev->controller_number]; + if (_mcp.device_info().no_handshake()) { + turn_it_on (); + } - if (pot) { - ControlState state; - - // bit 6 gives the sign - float sign = (ev->value & 0x40) == 0 ? 1.0 : -1.0; - // bits 0..5 give the velocity. we interpret this as "ticks - // moved before this message was sent" - float ticks = (ev->value & 0x3f); - if (ticks == 0) { - /* euphonix and perhaps other devices send zero - when they mean 1, we think. - */ - ticks = 1; - } - float delta = sign * (ticks / (float) 0x3f); + Pot* pot = pots[ev->controller_number]; - Strip* strip = dynamic_cast (&pot->group()); + // bit 6 gives the sign + float sign = (ev->value & 0x40) == 0 ? 1.0 : -1.0; + // bits 0..5 give the velocity. we interpret this as "ticks + // moved before this message was sent" + float ticks = (ev->value & 0x3f); + if (ticks == 0) { + /* euphonix and perhaps other devices send zero + when they mean 1, we think. + */ + ticks = 1; + } + float delta = sign * (ticks / (float) 0x3f); + + if (!pot) { + if (ev->controller_number == Jog::ID && _jog_wheel) { - if (strip) { - strip->handle_pot (*pot, delta); - } else { - JogWheel* wheel = dynamic_cast (pot); - if (wheel) { - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Jog wheel moved %1\n", state.ticks)); - wheel->jog_event (*_port, *pot, delta); - } else { - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("External controller moved %1\n", state.ticks)); - cout << "external controller" << delta << endl; - } + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Jog wheel moved %1\n", ticks)); + _jog_wheel->jog_event (delta); + return; } - } else { - DEBUG_TRACE (DEBUG::MackieControl, "pot not found\n"); + + return; } + + Strip* strip = dynamic_cast (&pot->group()); + if (strip) { + strip->handle_pot (*pot, delta); + } } void @@ -414,17 +494,20 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count { MidiByteArray bytes (count, raw_bytes); - DEBUG_TRACE (DEBUG::MackieControl, string_compose ("handle_midi_sysex: %1\n", bytes)); + if (_mcp.device_info().no_handshake()) { + turn_it_on (); + } + /* always save the device type ID so that our outgoing sysex messages * are correct */ if (_stype == mcu) { - mackie_sysex_hdr[3] = bytes[4]; + mackie_sysex_hdr[4] = bytes[4]; } else { - mackie_sysex_hdr_xt[3] = bytes[4]; + mackie_sysex_hdr_xt[4] = bytes[4]; } switch (bytes[5]) { @@ -435,7 +518,9 @@ Surface::handle_midi_sysex (MIDI::Parser &, MIDI::byte * raw_bytes, size_t count if (bytes[4] == 0x10 || bytes[4] == 0x11) { write_sysex (host_connection_query (bytes)); } else { - _active = true; + if (!_active) { + turn_it_on (); + } } break; @@ -516,10 +601,24 @@ Surface::host_connection_confirmation (const MidiByteArray & bytes) return MidiByteArray (2, 0x13, 0x00); } -void -Surface::handle_port_inactive (SurfacePort * port) +void +Surface::turn_it_on () { - _active = false; + if (_active) { + return; + } + + _active = true; + + for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) { + (*s)->notify_all (); + } + + update_view_mode_display (); + + if (_mcp.device_info ().has_global_controls ()) { + _mcp.update_global_button (Button::Read, _mcp.metering_active ()); + } } void @@ -542,18 +641,21 @@ Surface::write_sysex (MIDI::byte msg) _port->write (buf); } -void -Surface::drop_routes () -{ - for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) { - (*s)->set_route (boost::shared_ptr()); - } -} - uint32_t -Surface::n_strips () const +Surface::n_strips (bool with_locked_strips) const { - return strips.size(); + if (with_locked_strips) { + return strips.size(); + } + + uint32_t n = 0; + + for (Strips::const_iterator it = strips.begin(); it != strips.end(); ++it) { + if (!(*it)->locked()) { + ++n; + } + } + return n; } Strip* @@ -568,15 +670,35 @@ Surface::nth_strip (uint32_t n) const void Surface::zero_all () { - // TODO turn off Timecode displays + if (_mcp.device_info().has_timecode_display ()) { + display_timecode (string (10, '0'), string (10, ' ')); + } + + if (_mcp.device_info().has_two_character_display()) { + show_two_char_display (string (2, '0'), string (2, ' ')); + } + + if (_mcp.device_info().has_master_fader () && _master_fader) { + _port->write (_master_fader->zero ()); + } // zero all strips for (Strips::iterator it = strips.begin(); it != strips.end(); ++it) { - _port->write ((*it)->zero()); + (*it)->zero(); + } + + zero_controls (); +} + +void +Surface::zero_controls () +{ + if (!_mcp.device_info().has_global_controls()) { + return; } // turn off global buttons and leds - // global buttons are only ever on mcu_port, so we don't have + // global buttons are only ever on mcu_port, so we don't have // to figure out which port. for (Controls::iterator it = controls.begin(); it != controls.end(); ++it) { @@ -586,51 +708,28 @@ Surface::zero_all () } } - // any hardware-specific stuff - // clear 2-char display - _port->write (two_char_display (" ")); - // and the led ring for the master strip blank_jog_ring (); + + _last_master_gain_written = 0.0f; } void Surface::periodic (uint64_t now_usecs) { + master_gain_changed(); for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) { (*s)->periodic (now_usecs); } - } void Surface::write (const MidiByteArray& data) { - _port->write (data); -} - -void -Surface::jog_wheel_state_display (JogWheel::State state) -{ - switch (state) { - case JogWheel::zoom: - _port->write (two_char_display ("Zm")); - break; - case JogWheel::scroll: - _port->write (two_char_display ("Sc")); - break; - case JogWheel::scrub: - _port->write (two_char_display ("Sb")); - break; - case JogWheel::shuttle: - _port->write (two_char_display ("Sh")); - break; - case JogWheel::speed: - _port->write (two_char_display ("Sp")); - break; - case JogWheel::select: - _port->write (two_char_display ("Se")); - break; + if (_active) { + _port->write (data); + } else { + DEBUG_TRACE (DEBUG::MackieControl, "surface not active, write ignored\n"); } } @@ -638,69 +737,75 @@ void Surface::map_routes (const vector >& routes) { vector >::const_iterator r; - Strips::iterator s; + Strips::iterator s = strips.begin(); - for (s = strips.begin(); s != strips.end(); ++s) { - (*s)->set_route (boost::shared_ptr()); + for (r = routes.begin(); r != routes.end() && s != strips.end(); ++s) { + + /* don't try to assign routes to a locked strip. it won't + use it anyway, but if we do, then we get out of sync + with the proposed mapping. + */ + + if (!(*s)->locked()) { + (*s)->set_route (*r); + ++r; + } } - for (r = routes.begin(), s = strips.begin(); r != routes.end() && s != strips.end(); ++r, ++s) { - (*s)->set_route (*r); + for (; s != strips.end(); ++s) { + (*s)->set_route (boost::shared_ptr()); } + + } -static char translate_seven_segment (char achar) +static char +translate_seven_segment (char achar) { achar = toupper (achar); - if (achar >= 0x40 && achar <= 0x60) + + if (achar >= 0x40 && achar <= 0x60) { return achar - 0x40; - else if (achar >= 0x21 && achar <= 0x3f) - return achar; - else - return 0x00; + } else if (achar >= 0x21 && achar <= 0x3f) { + return achar; + } else { + return 0x00; + } } -MidiByteArray -Surface::two_char_display (const std::string & msg, const std::string & dots) +void +Surface::show_two_char_display (const std::string & msg, const std::string & dots) { - if (_stype != mcu) { - return MidiByteArray(); + if (_stype != mcu || !_mcp.device_info().has_two_character_display() || msg.length() != 2 || dots.length() != 2) { + return; } - - if (msg.length() != 2) throw MackieControlException ("MackieMidiBuilder::two_char_display: msg must be exactly 2 characters"); - if (dots.length() != 2) throw MackieControlException ("MackieMidiBuilder::two_char_display: dots must be exactly 2 characters"); - MidiByteArray bytes (6, 0xb0, 0x4a, 0x00, 0xb0, 0x4b, 0x00); + MidiByteArray right (3, 0xb0, 0x4b, 0x00); + MidiByteArray left (3, 0xb0, 0x4a, 0x00); - // chars are understood by the surface in right-to-left order - // could also exchange the 0x4a and 0x4b, above - bytes[5] = translate_seven_segment (msg[0]) + (dots[0] == '.' ? 0x40 : 0x00); - bytes[2] = translate_seven_segment (msg[1]) + (dots[1] == '.' ? 0x40 : 0x00); + right[2] = translate_seven_segment (msg[0]) + (dots[0] == '.' ? 0x40 : 0x00); + left[2] = translate_seven_segment (msg[1]) + (dots[1] == '.' ? 0x40 : 0x00); - return bytes; + _port->write (right); + _port->write (left); } -MidiByteArray -Surface::two_char_display (unsigned int value, const std::string & /*dots*/) +void +Surface::show_two_char_display (unsigned int value, const std::string & /*dots*/) { ostringstream os; os << setfill('0') << setw(2) << value % 100; - return two_char_display (os.str()); + show_two_char_display (os.str()); } -void -Surface::display_timecode (const std::string & timecode, const std::string & timecode_last) +void +Surface::display_timecode (const std::string & timecode, const std::string & last_timecode) { - if (has_timecode_display()) { - _port->write (timecode_display (timecode, timecode_last)); + if (!_active || !_mcp.device_info().has_timecode_display()) { + return; } -} - -MidiByteArray -Surface::timecode_display (const std::string & timecode, const std::string & last_timecode) -{ // if there's no change, send nothing, not even sysex header - if (timecode == last_timecode) return MidiByteArray(); + if (timecode == last_timecode) return; // length sanity checking string local_timecode = timecode; @@ -714,29 +819,20 @@ Surface::timecode_display (const std::string & timecode, const std::string & las while (local_timecode.length() < 10) { local_timecode += " "; } - - // find the suffix of local_timecode that differs from last_timecode - std::pair pp = mismatch (last_timecode.begin(), last_timecode.end(), local_timecode.begin()); - - MidiByteArray retval; - - // sysex header - retval << sysex_hdr(); - // code for timecode display - retval << 0x10; - - // translate characters. These are sent in reverse order of display - // hence the reverse iterators - string::reverse_iterator rend = reverse_iterator (pp.second); - for (string::reverse_iterator it = local_timecode.rbegin(); it != rend; ++it) { - retval << translate_seven_segment (*it); + // translate characters. + // Only the characters that actually changed are sent. + int position = 0x3f; + int i; + for (i = local_timecode.length () - 1; i >= 0; i--) { + position++; + if (local_timecode[i] == last_timecode[i]) { + continue; + } + MidiByteArray retval (2, 0xb0, position); + retval << translate_seven_segment (local_timecode[i]); + _port->write (retval); } - - // sysex trailer - retval << MIDI::eox; - - return retval; } void @@ -751,46 +847,59 @@ void Surface::update_view_mode_display () { string text; - Button* button = 0; + int id = -1; + + if (!_active) { + return; + } switch (_mcp.view_mode()) { case MackieControlProtocol::Mixer: - _port->write (two_char_display ("Mx")); - button = buttons[Button::Pan]; + show_two_char_display ("Mx"); + id = Button::Pan; break; case MackieControlProtocol::Dynamics: - _port->write (two_char_display ("Dy")); - button = buttons[Button::Dyn]; + show_two_char_display ("Dy"); + id = Button::Dyn; break; case MackieControlProtocol::EQ: - _port->write (two_char_display ("EQ")); - button = buttons[Button::Eq]; + show_two_char_display ("EQ"); + id = Button::Eq; break; case MackieControlProtocol::Loop: - _port->write (two_char_display ("LP")); - button = buttons[Button::Loop]; + show_two_char_display ("LP"); + id = Button::Loop; break; case MackieControlProtocol::AudioTracks: - _port->write (two_char_display ("AT")); + show_two_char_display ("AT"); break; case MackieControlProtocol::MidiTracks: - _port->write (two_char_display ("MT")); - break; - case MackieControlProtocol::Busses: - _port->write (two_char_display ("Bs")); + show_two_char_display ("MT"); break; case MackieControlProtocol::Sends: - _port->write (two_char_display ("Sn")); - button = buttons[Button::Sends]; + show_two_char_display ("Sn"); + id = Button::Sends; break; case MackieControlProtocol::Plugins: - _port->write (two_char_display ("Pl")); - button = buttons[Button::Plugin]; + show_two_char_display ("Pl"); + id = Button::Plugin; + break; + default: break; } - if (button) { - _port->write (button->set_state (on)); + if (id >= 0) { + + /* we are attempting to turn a global button/LED on */ + + map::iterator x = controls_by_device_independent_id.find (id); + + if (x != controls_by_device_independent_id.end()) { + Button* button = dynamic_cast (x->second); + if (button) { + _port->write (button->set_state (on)); + } + } } if (!text.empty()) { @@ -801,10 +910,52 @@ Surface::update_view_mode_display () } void -Surface::gui_selection_changed (ARDOUR::RouteNotificationListPtr routes) +Surface::gui_selection_changed (const ARDOUR::StrongRouteNotificationList& routes) { for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) { - _port->write ((*s)->gui_selection_changed (routes)); + (*s)->gui_selection_changed (routes); + } +} + +void +Surface::say_hello () +{ + /* wakeup for Mackie Control */ + MidiByteArray wakeup (7, MIDI::sysex, 0x00, 0x00, 0x66, 0x14, 0x00, MIDI::eox); + _port->write (wakeup); + wakeup[4] = 0x15; /* wakup Mackie XT */ + _port->write (wakeup); + wakeup[4] = 0x10; /* wakupe Logic Control */ + _port->write (wakeup); + wakeup[4] = 0x11; /* wakeup Logic Control XT */ + _port->write (wakeup); +} + +void +Surface::next_jog_mode () +{ +} + +void +Surface::set_jog_mode (JogWheel::Mode) +{ +} + +bool +Surface::route_is_locked_to_strip (boost::shared_ptr r) const +{ + for (Strips::const_iterator s = strips.begin(); s != strips.end(); ++s) { + if ((*s)->route() == r && (*s)->locked()) { + return true; + } } + return false; } +void +Surface::notify_metering_state_changed() +{ + for (Strips::const_iterator s = strips.begin(); s != strips.end(); ++s) { + (*s)->notify_metering_state_changed (); + } +}