#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/tempo.h"
+#include "ardour/track.h"
#include "ardour/types.h"
#include "ardour/audioengine.h"
#include "midi_byte_array.h"
#include "mackie_control_exception.h"
+#include "device_profile.h"
#include "surface_port.h"
#include "surface.h"
#include "strip.h"
const int MackieControlProtocol::MODIFIER_OPTION = 0x1;
const int MackieControlProtocol::MODIFIER_CONTROL = 0x2;
-const int MackieControlProtocol::MODIFIER_SHIFT = 0x3;
-const int MackieControlProtocol::MODIFIER_CMDALT = 0x4;
+const int MackieControlProtocol::MODIFIER_SHIFT = 0x4;
+const int MackieControlProtocol::MODIFIER_CMDALT = 0x8;
MackieControlProtocol* MackieControlProtocol::_instance = 0;
, _flip_mode (false)
, _view_mode (Mixer)
, _current_selected_track (-1)
+ , _modifier_state (0)
{
DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
DeviceInfo::reload_device_info ();
+ DeviceProfile::reload_device_profiles ();
+
set_device (Config->get_mackie_device_name());
+ set_profile (Config->get_mackie_device_profile());
AudioEngine::instance()->PortConnectedOrDisconnected.connect (
audio_engine_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::port_connected_or_disconnected, this, _2, _4, _5),
set_view_mode (_view_mode);
/* current bank has not been saved */
-
session->set_dirty();
}
return false;
}
+ struct timeval now;
+ uint64_t now_usecs;
+ gettimeofday (&now, 0);
+
+ now_usecs = (now.tv_sec * 1000000) + now.tv_usec;
+
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
- (*s)->periodic ();
+ (*s)->periodic (now_usecs);
}
return true;
{
switch (_timecode_type) {
case ARDOUR::AnyTime::BBT:
- update_global_led ("beats", on);
- update_global_led ("timecode", off);
+ update_global_led (Led::Beats, on);
+ update_global_led (Led::Timecode, off);
break;
case ARDOUR::AnyTime::Timecode:
- update_global_led ("timecode", on);
- update_global_led ("beats", off);
+ update_global_led (Led::Timecode, on);
+ update_global_led (Led::Beats, off);
break;
default:
ostringstream os;
}
void
-MackieControlProtocol::update_global_button (const string & name, LedState ls)
+MackieControlProtocol::update_global_button (int id, LedState ls)
{
boost::shared_ptr<Surface> surface = surfaces.front();
return;
}
- if (surface->controls_by_name.find (name) != surface->controls_by_name.end()) {
- Button * button = dynamic_cast<Button*> (surface->controls_by_name[name]);
+ map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (id);
+ if (x != surface->controls_by_device_independent_id.end()) {
+ Button * button = dynamic_cast<Button*> (x->second);
surface->write (button->set_state (ls));
} else {
- DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Button %1 not found\n", name));
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Button %1 not found\n", id));
}
}
void
-MackieControlProtocol::update_global_led (const string & name, LedState ls)
+MackieControlProtocol::update_global_led (int id, LedState ls)
{
boost::shared_ptr<Surface> surface = surfaces.front();
return;
}
- if (surface->controls_by_name.find (name) != surface->controls_by_name.end()) {
- Led * led = dynamic_cast<Led*> (surface->controls_by_name[name]);
+ map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (id);
+ if (x != surface->controls_by_device_independent_id.end()) {
+ Led * led = dynamic_cast<Led*> (x->second);
surface->write (led->set_state (ls));
} else {
- DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", name));
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", id));
}
}
}
}
+void
+MackieControlProtocol::set_profile (const string& profile_name)
+{
+ if (profile_name == "default") {
+ /* reset to default */
+ _device_profile = DeviceProfile (profile_name);
+ }
+
+ map<string,DeviceProfile>::iterator d = DeviceProfile::device_profiles.find (profile_name);
+
+ if (d == DeviceProfile::device_profiles.end()) {
+ return;
+ }
+
+ _device_profile = d->second;
+}
+
void
MackieControlProtocol::set_device (const string& device_name)
{
os << _current_initial_bank;
node->add_property (X_("bank"), os.str());
- for (uint32_t n = 0; n < 16; ++n) {
- ostringstream s;
- s << string_compose ("f%1-action", n+1);
- node->add_property (s.str().c_str(), f_action (n));
- }
-
return *node;
}
}
}
- _f_actions.clear ();
- _f_actions.resize (16);
-
- for (uint32_t n = 0; n < 16; ++n) {
- string action;
- if ((prop = node.property (string_compose ("f%1-action", n+1))) != 0) {
- action = prop->value();
- }
-
- if (action.empty()) {
- /* default action if nothing is specified */
- action = string_compose ("Editor/goto-visual-state-%1", n+1);
- }
-
- _f_actions[n] = action;
- }
-
return retval;
}
void MackieControlProtocol::notify_parameter_changed (std::string const & p)
{
if (p == "punch-in") {
- update_global_button ("punch_in", session->config.get_punch_in());
+ update_global_button (Button::PunchIn, session->config.get_punch_in());
} else if (p == "punch-out") {
- update_global_button ("punch_out", session->config.get_punch_out());
+ update_global_button (Button::PunchOut, session->config.get_punch_out());
} else if (p == "clicking") {
- update_global_button ("clicking", Config->get_clicking());
+ // update_global_button (Button::RelayClick, Config->get_clicking());
} else {
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("parameter changed: %1\n", p));
}
{
boost::shared_ptr<Surface> surface = surfaces.front();
- Led* rude_solo = dynamic_cast<Led*> (surface->controls_by_name["solo"]);
-
- if (rude_solo) {
- surface->write (rude_solo->set_state (active ? flashing : off));
+ map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Led::RudeSolo);
+ if (x != surface->controls_by_device_independent_id.end()) {
+ Led* rude_solo = dynamic_cast<Led*> (x->second);
+ if (rude_solo) {
+ surface->write (rude_solo->set_state (active ? flashing : off));
+ }
}
}
void
MackieControlProtocol::notify_loop_state_changed()
{
- update_global_button ("loop", session->get_play_loop());
+ update_global_button (Button::Loop, session->get_play_loop());
}
void
MackieControlProtocol::notify_transport_state_changed()
{
// switch various play and stop buttons on / off
- update_global_button ("play", session->transport_speed() == 1.0);
- update_global_button ("stop", !session->transport_rolling());
- update_global_button ("rewind", session->transport_speed() < 0.0);
- update_global_button ("ffwd", session->transport_speed() > 1.0);
+ update_global_button (Button::Play, session->transport_speed() == 1.0);
+ update_global_button (Button::Stop, !session->transport_rolling());
+ update_global_button (Button::Rewind, session->transport_speed() < 0.0);
+ update_global_button (Button::Ffwd, session->transport_speed() > 1.0);
_transport_previously_rolling = session->transport_rolling();
}
void
MackieControlProtocol::notify_record_state_changed ()
{
- /* rec is a tristate */
-
+ boost::shared_ptr<Surface> surface = surfaces.front();
- Button * rec = reinterpret_cast<Button*> (surfaces.front()->controls_by_name["record"]);
- if (rec) {
- LedState ls;
+ /* rec is a tristate */
- switch (session->record_status()) {
- case Session::Disabled:
- DEBUG_TRACE (DEBUG::MackieControl, "record state changed to disabled, LED off\n");
- ls = off;
- break;
- case Session::Recording:
- DEBUG_TRACE (DEBUG::MackieControl, "record state changed to recording, LED on\n");
- ls = on;
- break;
- case Session::Enabled:
- DEBUG_TRACE (DEBUG::MackieControl, "record state changed to enabled, LED flashing\n");
- ls = flashing;
- break;
+ map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Button::Record);
+ if (x != surface->controls_by_device_independent_id.end()) {
+ Button * rec = dynamic_cast<Button*> (x->second);
+ if (rec) {
+ LedState ls;
+
+ switch (session->record_status()) {
+ case Session::Disabled:
+ DEBUG_TRACE (DEBUG::MackieControl, "record state changed to disabled, LED off\n");
+ ls = off;
+ break;
+ case Session::Recording:
+ DEBUG_TRACE (DEBUG::MackieControl, "record state changed to recording, LED on\n");
+ ls = on;
+ break;
+ case Session::Enabled:
+ DEBUG_TRACE (DEBUG::MackieControl, "record state changed to enabled, LED flashing\n");
+ ls = flashing;
+ break;
+ }
+
+ surface->write (rec->set_state (ls));
}
-
- surfaces.front()->write (rec->set_state (ls));
- } else {
- DEBUG_TRACE (DEBUG::MackieControl, "record button control not found\n");
}
}
return 0;
}
-/** Add a timeout so that a control's in_use flag will be reset some time in the future.
- * @param in_use_control the control whose in_use flag to reset.
- * @param touch_control a touch control to emit an event for, or 0.
- */
-void
-MackieControlProtocol::add_in_use_timeout (Surface& surface, Control& in_use_control, boost::weak_ptr<AutomationControl> touched)
-{
- Glib::RefPtr<Glib::TimeoutSource> timeout (Glib::TimeoutSource::create (250)); // milliseconds
-
- in_use_control.in_use_connection.disconnect ();
- in_use_control.in_use_connection = timeout->connect (
- sigc::bind (sigc::mem_fun (*this, &MackieControlProtocol::control_in_use_timeout), &surface, &in_use_control, touched));
-
- timeout->attach (main_loop()->get_context());
-
- DEBUG_TRACE (DEBUG::MackieControl, string_compose ("timeout queued for surface %1, control %2\n",
- surface.number(), &in_use_control));}
-
-/** Handle timeouts to reset in_use for controls that can't
- * do this by themselves (e.g. pots, and faders without touch support).
- * @param in_use_control the control whose in_use flag to reset.
- * @param touch_control a touch control to emit an event for, or 0.
- */
-bool
-MackieControlProtocol::control_in_use_timeout (Surface* surface, Control* in_use_control, boost::weak_ptr<AutomationControl> wtouched)
-{
- boost::shared_ptr<AutomationControl> touched (wtouched.lock());
-
- DEBUG_TRACE (DEBUG::MackieControl, string_compose ("timeout elapsed for surface %1, control %2\n", surface->number(), in_use_control));
-
- in_use_control->set_in_use (false);
-
- if (touched) {
- /* end the touch, and mark the end */
- touched->stop_touch (session->transport_frame(), true);
- }
-
- // only call this method once from the timer
- return false;
-}
-
void
MackieControlProtocol::update_led (Surface& surface, Button& button, Mackie::LedState ls)
{
void
MackieControlProtocol::build_button_map ()
{
-#define DEFINE_BUTTON_HANDLER(b,p,r) button_map.insert (pair<int,ButtonHandlers> ((b), ButtonHandlers ((p),(r))));
+ /* this maps our device-independent button codes to the methods that handle them.
+ */
- DEFINE_BUTTON_HANDLER (Button::Io, &MackieControlProtocol::io_press, &MackieControlProtocol::io_release);
+#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);
DEFINE_BUTTON_HANDLER (Button::Sends, &MackieControlProtocol::sends_press, &MackieControlProtocol::sends_release);
DEFINE_BUTTON_HANDLER (Button::Pan, &MackieControlProtocol::pan_press, &MackieControlProtocol::pan_release);
DEFINE_BUTTON_HANDLER (Button::Plugin, &MackieControlProtocol::plugin_press, &MackieControlProtocol::plugin_release);
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);
+ DEFINE_BUTTON_HANDLER (Button::View, &MackieControlProtocol::view_press, &MackieControlProtocol::view_release);
}
void
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Handling %1 for button %2\n", (bs == press ? "press" : "release"), button.id()));
- ButtonMap::iterator b = button_map.find (button.id());
+ /* check profile first */
+
+ string action = _device_profile.get_button_action (button.bid(), _modifier_state);
+
+ if (!action.empty()) {
+ /* if there is a bound action for this button, and this is a press event,
+ carry out the action. If its a release event, do nothing since we
+ don't bind to them at all but don't want any other handling to
+ occur either.
+ */
+ if (bs == press) {
+ access_action (action);
+ }
+ return;
+ }
+
+ /* lookup using the device-INDEPENDENT button ID */
+
+ ButtonMap::iterator b = button_map.find (button.bid());
if (b != button_map.end()) {
break;
}
} else {
- DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button handlers for ID %1\n", button.id()));
- }
-}
-
-void
-MackieControlProtocol::select_track (boost::shared_ptr<Route> r)
-{
- if (_modifier_state == MODIFIER_SHIFT) {
- r->gain_control()->set_value (0.0);
- } else {
- if (_current_selected_track > 0 && r->remote_control_id() == (uint32_t) _current_selected_track) {
- UnselectTrack (); /* EMIT SIGNAL */
- _current_selected_track = -1;
- } else {
- SelectByRID (r->remote_control_id()); /* EMIT SIGNAL */
- _current_selected_track = r->remote_control_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;
}
}
port_sources.clear ();
}
-string
-MackieControlProtocol::f_action (uint32_t fn)
-{
- if (fn >= _f_actions.size()) {
- return string();
- }
-
- return _f_actions[fn];
-}
-
-void
-MackieControlProtocol::f_press (uint32_t fn)
-{
- string action = f_action (0);
- if (!action.empty()) {
- access_action (action);
- }
-}
-
void
MackieControlProtocol::set_view_mode (ViewMode m)
{
void
MackieControlProtocol::add_down_select_button (int surface, int strip)
{
- _down_select_buttons.push_back ((surface<<8)|(strip&0xf));
+ _down_select_buttons.insert ((surface<<8)|(strip&0xf));
}
void
MackieControlProtocol::remove_down_select_button (int surface, int strip)
{
- list<uint32_t>::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (surface<<8)|(strip&0xf));
+ DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (surface<<8)|(strip&0xf));
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down select buttons\n", surface, strip));
if (x != _down_select_buttons.end()) {
_down_select_buttons.erase (x);
+ } else {
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 not found in down select buttons\n",
+ surface, strip));
}
}
-bool
+void
MackieControlProtocol::select_range ()
{
- vector<boost::shared_ptr<Route> > routes;
- pull_route_range (_down_select_buttons, routes);
+ RouteList routes;
- if (routes.empty()) {
- return false;
- }
+ pull_route_range (_down_select_buttons, routes);
- /* do something */
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("select range: found %1 routes\n", routes.size()));
- return true;
-}
-
-void
-MackieControlProtocol::add_down_solo_button (int surface, int strip)
-{
- _down_solo_buttons.push_back ((surface<<8)|(strip&0xf));
-}
-
-void
-MackieControlProtocol::remove_down_solo_button (int surface, int strip)
-{
- list<uint32_t>::iterator x = find (_down_solo_buttons.begin(), _down_solo_buttons.end(), (surface<<8)|(strip&0xf));
- if (x != _down_solo_buttons.end()) {
- _down_solo_buttons.erase (x);
+ if (!routes.empty()) {
+ for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+ if (r == routes.begin()) {
+ SetRouteSelection ((*r)->remote_control_id());
+ } else {
+ AddRouteToSelection ((*r)->remote_control_id());
+ }
+ }
}
}
-bool
-MackieControlProtocol::solo_range ()
+void
+MackieControlProtocol::add_down_button (AutomationType a, int surface, int strip)
{
- vector<boost::shared_ptr<Route> > routes;
- pull_route_range (_down_solo_buttons, routes);
+ DownButtonMap::iterator m = _down_buttons.find (a);
- if (routes.empty()) {
- return false;
+ if (m == _down_buttons.end()) {
+ _down_buttons[a] = DownButtonList();
}
- /* do something */
-
- return true;
+ _down_buttons[a].insert ((surface<<8)|(strip&0xf));
}
void
-MackieControlProtocol::add_down_mute_button (int surface, int strip)
+MackieControlProtocol::remove_down_button (AutomationType a, int surface, int strip)
{
- _down_mute_buttons.push_back ((surface<<8)|(strip&0xf));
-}
+ DownButtonMap::iterator m = _down_buttons.find (a);
-void
-MackieControlProtocol::remove_down_mute_button (int surface, int strip)
-{
- list<uint32_t>::iterator x = find (_down_mute_buttons.begin(), _down_mute_buttons.end(), (surface<<8)|(strip&0xf));
- if (x != _down_mute_buttons.end()) {
- _down_mute_buttons.erase (x);
- }
-}
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down buttons for %3\n", surface, strip, (int) a));
-bool
-MackieControlProtocol::mute_range ()
-{
- vector<boost::shared_ptr<Route> > routes;
- pull_route_range (_down_mute_buttons, routes);
-
- if (routes.empty()) {
- return false;
+ if (m == _down_buttons.end()) {
+ return;
}
- /* do something */
+ DownButtonList& l (m->second);
+ DownButtonList::iterator x = find (l.begin(), l.end(), (surface<<8)|(strip&0xf));
- return true;
+ if (x != l.end()) {
+ l.erase (x);
+ } else {
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 not found in down buttons for %3\n",
+ surface, strip, (int) a));
+ }
}
-void
-MackieControlProtocol::add_down_recenable_button (int surface, int strip)
+MackieControlProtocol::ControlList
+MackieControlProtocol::down_controls (AutomationType p)
{
- _down_recenable_buttons.push_back ((surface<<8)|(strip&0xf));
-}
+ ControlList controls;
+ RouteList routes;
-void
-MackieControlProtocol::remove_down_recenable_button (int surface, int strip)
-{
- list<uint32_t>::iterator x = find (_down_recenable_buttons.begin(), _down_recenable_buttons.end(), (surface<<8)|(strip&0xf));
- if (x != _down_recenable_buttons.end()) {
- _down_recenable_buttons.erase (x);
- }
-}
+ DownButtonMap::iterator m = _down_buttons.find (p);
-bool
-MackieControlProtocol::recenable_range ()
-{
- vector<boost::shared_ptr<Route> > routes;
- pull_route_range (_down_recenable_buttons, routes);
+ if (m == _down_buttons.end()) {
+ return controls;
+ }
+
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("looking for down buttons for %1, got %2\n",
+ p, m->second.size()));
- if (routes.empty()) {
- return false;
+ pull_route_range (m->second, routes);
+
+ switch (p) {
+ case GainAutomation:
+ for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+ controls.push_back ((*r)->gain_control());
+ }
+ break;
+ case SoloAutomation:
+ for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+ controls.push_back ((*r)->solo_control());
+ }
+ break;
+ case MuteAutomation:
+ for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+ controls.push_back ((*r)->mute_control());
+ }
+ break;
+ case RecEnableAutomation:
+ for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+ boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<Track> (*r);
+ if (trk) {
+ controls.push_back (trk->rec_enable_control());
+ }
+ }
+ break;
+ default:
+ break;
}
- /* do something */
+ return controls;
- return true;
}
-
-
+
struct ButtonRangeSorter {
bool operator() (const uint32_t& a, const uint32_t& b) {
return (a>>8) < (b>>8) // a.surface < b.surface
};
void
-MackieControlProtocol::pull_route_range (list<uint32_t>& down, vector<boost::shared_ptr<Route> >& selected)
+MackieControlProtocol::pull_route_range (DownButtonList& down, RouteList& selected)
{
ButtonRangeSorter cmp;
return;
}
- down.sort (cmp);
+ list<uint32_t> ldown;
+ ldown.insert (ldown.end(), down.begin(), down.end());
+ ldown.sort (cmp);
- uint32_t first = down.front();
- uint32_t last = down.back ();
+ uint32_t first = ldown.front();
+ uint32_t last = ldown.back ();
uint32_t first_surface = first>>8;
- uint32_t first_strip = first&0x8;
+ uint32_t first_strip = first&0xf;
uint32_t last_surface = last>>8;
- uint32_t last_strip = last&0x8;
+ uint32_t last_strip = last&0xf;
+
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("PRR %5 in list %1.%2 - %3.%4\n", first_surface, first_strip, last_surface, last_strip,
+ down.size()));
for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
if ((*s)->number() == last_surface) {
ls = last_strip;
+ ls += 1;
} else {
ls = (*s)->n_strips ();
}
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("adding strips for surface %1 (%2 .. %3)\n",
+ (*s)->number(), fs, ls));
+
for (uint32_t n = fs; n < ls; ++n) {
boost::shared_ptr<Route> r = (*s)->nth_strip (n)->route();
if (r) {