#include <float.h>
#include <sys/time.h>
#include <errno.h>
-#include <poll.h>
#include <boost/shared_array.hpp>
, AbstractUI<MackieControlUIRequest> ("mackie")
, _current_initial_bank (0)
, _timecode_type (ARDOUR::AnyTime::BBT)
- , _input_bundle (new ARDOUR::Bundle (_("Mackie Control In"), true))
- , _output_bundle (new ARDOUR::Bundle (_("Mackie Control Out"), false))
, _gui (0)
, _zoom_mode (false)
, _scrub_mode (false)
- , _flip_mode (false)
+ , _flip_mode (Normal)
, _view_mode (Mixer)
, _current_selected_track (-1)
, _modifier_state (0)
, _ipmidi_base (MIDI::IPMIDIPort::lowest_ipmidi_port_default)
, needs_ipmidi_restart (false)
+ , _metering_active (true)
+ , _initialized (false)
+ , _surfaces_state (0)
+ , _surfaces_version (0)
{
DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
DeviceInfo::reload_device_info ();
DeviceProfile::reload_device_profiles ();
- TrackSelectionChanged.connect (gui_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::gui_track_selection_changed, this, _1), this);
+ TrackSelectionChanged.connect (gui_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::gui_track_selection_changed, this, _1, true), this);
_instance = this;
MackieControlProtocol::~MackieControlProtocol()
{
- DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol\n");
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol init\n");
+
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol drop_connections ()\n");
+ drop_connections ();
- _active = false;
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol tear_down_gui ()\n");
+ tear_down_gui ();
- /* stop event loop */
+ delete _surfaces_state;
+ /* stop event loop */
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol BaseUI::quit ()\n");
BaseUI::quit ();
try {
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol close()\n");
close();
}
catch (exception & e) {
cout << "~MackieControlProtocol caught unknown" << endl;
}
- DEBUG_TRACE (DEBUG::MackieControl, "finished ~MackieControlProtocol::MackieControlProtocol\n");
-
_instance = 0;
+
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol done\n");
}
void
for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
(*si)->say_hello ();
}
+
+ if (_device_info.no_handshake()) {
+ for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
+ (*si)->turn_it_on ();
+ }
+ }
}
// go to the previous track.
continue;
}
- if (route->is_hidden() || route->is_master() || route->is_monitor()) {
+ if (route->is_auditioner() || route->is_master() || route->is_monitor()) {
continue;
}
uint32_t strip_cnt = n_strips (false); // do not include locked strips
// in this count
- if (sorted.size() <= strip_cnt && !force) {
- /* no banking - not enough routes to fill all strips */
+ if (sorted.size() <= strip_cnt && _current_initial_bank == 0 && !force) {
+ /* no banking - not enough routes to fill all strips and we're
+ * not at the first one.
+ */
return;
}
/* reset this to get the right display of view mode after the switch */
set_view_mode (_view_mode);
+
+ /* make sure selection is correct */
+
+ _gui_track_selection_changed (&_last_selected_routes, false);
/* current bank has not been saved */
session->set_dirty();
int
MackieControlProtocol::set_active (bool yn)
{
- if (yn == _active) {
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose("MackieControlProtocol::set_active init with yn: '%1'\n", yn));
+
+ if (yn == active()) {
return 0;
}
BaseUI::run ();
- create_surfaces ();
+ if (create_surfaces ()) {
+ return -1;
+ }
connect_session_signals ();
- _active = true;
update_surfaces ();
/* set up periodic task for metering and automation
BaseUI::quit ();
close ();
- _active = false;
}
+ ControlProtocol::set_active (yn);
+
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose("MackieControlProtocol::set_active done with yn: '%1'\n", yn));
+
return 0;
}
bool
MackieControlProtocol::periodic ()
{
- if (!_active) {
+ if (!active()) {
return false;
}
ipmidi_restart ();
return true;
}
+
+ if (!_initialized) {
+ initialize();
+ }
struct timeval now;
uint64_t now_usecs;
now_usecs = (now.tv_sec * 1000000) + now.tv_usec;
- for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
- (*s)->periodic (now_usecs);
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+ (*s)->periodic (now_usecs);
+ }
}
update_timecode_display ();
return true;
}
-
void
MackieControlProtocol::update_timecode_beats_led()
{
+ if (!_device_info.has_timecode_display()) {
+ return;
+ }
+
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose("MackieControlProtocol::update_timecode_beats_led(): %1\n", _timecode_type));
switch (_timecode_type) {
case ARDOUR::AnyTime::BBT:
update_global_led (Led::Beats, on);
void
MackieControlProtocol::update_global_button (int id, LedState ls)
{
- boost::shared_ptr<Surface> surface = surfaces.front();
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
- if (!surface->type() == mcu) {
+ if (!_device_info.has_global_controls()) {
return;
}
+ boost::shared_ptr<Surface> surface = surfaces.front();
+
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);
void
MackieControlProtocol::update_global_led (int id, LedState ls)
{
- boost::shared_ptr<Surface> surface = surfaces.front();
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
- if (!surface->type() == mcu) {
+ if (!_device_info.has_global_controls()) {
return;
}
+ boost::shared_ptr<Surface> surface = surfaces.front();
+
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);
+ DEBUG_TRACE (DEBUG::MackieControl, "Writing LedState\n");
surface->write (led->set_state (ls));
} else {
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", id));
void
MackieControlProtocol::update_surfaces()
{
- if (!_active) {
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::update_surfaces() init\n");
+ if (!active()) {
return;
}
// _current_initial_bank is initialised by set_state
switch_banks (_current_initial_bank, true);
- // sometimes the jog wheel is a pot
- surfaces.front()->blank_jog_ring ();
-
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::update_surfaces() finished\n");
+}
+
+void
+MackieControlProtocol::initialize()
+{
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ if (surfaces.empty()) {
+ return;
+ }
+
+ if (!surfaces.front()->active ()) {
+ return;
+ }
+
+ // sometimes the jog wheel is a pot
+ if (_device_info.has_jog_wheel()) {
+ surfaces.front()->blank_jog_ring ();
+ }
+ }
+
// update global buttons and displays
notify_record_state_changed();
notify_transport_state_changed();
update_timecode_beats_led();
+
+ _initialized = true;
}
void
_device_profile = d->second;
}
-void
-MackieControlProtocol::set_device (const string& device_name, bool allow_activation)
+int
+MackieControlProtocol::set_device_info (const string& device_name)
{
map<string,DeviceInfo>::iterator d = DeviceInfo::device_info.find (device_name);
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("new device chosen %1\n", device_name));
+
if (d == DeviceInfo::device_info.end()) {
- return;
+ return -1;
}
- if (_active) {
- clear_ports ();
- surfaces.clear ();
+ _device_info = d->second;
+
+ return 0;
+}
+
+int
+MackieControlProtocol::set_device (const string& device_name)
+{
+ if (set_device_info (device_name)) {
+ return -1;
}
- _device_info = d->second;
+ clear_surfaces ();
- if (allow_activation) {
- set_active (true);
- } else {
- if (_active) {
- create_surfaces ();
- switch_banks (0, true);
- }
+ if (create_surfaces ()) {
+ return -1;
}
+
+ switch_banks (0, true);
+
+ return 0;
}
-void
+int
MackieControlProtocol::create_surfaces ()
{
string device_name;
for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
- boost::shared_ptr<Surface> surface (new Surface (*this, device_name, n, stype));
- surfaces.push_back (surface);
+ boost::shared_ptr<Surface> surface;
+
+ try {
+ surface.reset (new Surface (*this, device_name, n, stype));
+ } catch (...) {
+ return -1;
+ }
+
+ if (_surfaces_state) {
+ surface->set_state (*_surfaces_state, _surfaces_version);
+ }
+
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surfaces.push_back (surface);
+ }
/* next device will be an extender */
stype = ext;
if (!_device_info.uses_ipmidi()) {
+
+ _input_bundle.reset (new ARDOUR::Bundle (_("Mackie Control In"), true));
+ _output_bundle.reset (new ARDOUR::Bundle (_("Mackie Control Out"), false));
+
_input_bundle->add_channel (
surface->port().input_port().name(),
ARDOUR::DataType::MIDI,
ARDOUR::DataType::MIDI,
session->engine().make_port_name_non_relative (surface->port().output_port().name())
);
+
+ session->BundleAdded (_input_bundle);
+ session->BundleAdded (_output_bundle);
+
+ } else {
+ _input_bundle.reset ((ARDOUR::Bundle*) 0);
+ _output_bundle.reset ((ARDOUR::Bundle*) 0);
+
+ session->BundleRemoved (_input_bundle);
+ session->BundleRemoved (_output_bundle);
}
int fd;
g_source_ref (psrc->gobj());
}
}
+
+ return 0;
}
void
MackieControlProtocol::close()
{
- clear_ports ();
-
- port_connections.drop_connections ();
session_connections.drop_connections ();
route_connections.drop_connections ();
periodic_connection.disconnect ();
- surfaces.clear ();
+ clear_surfaces();
}
XMLNode&
MackieControlProtocol::get_state()
{
- DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state\n");
- char buf[16];
+ XMLNode& node (ControlProtocol::get_state());
- // add name of protocol
- XMLNode* node = new XMLNode (X_("Protocol"));
- node->add_property (X_("name"), ARDOUR::ControlProtocol::_name);
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state init\n");
+ char buf[16];
// add current bank
snprintf (buf, sizeof (buf), "%d", _current_initial_bank);
- node->add_property (X_("bank"), buf);
+ node.add_property (X_("bank"), buf);
// ipMIDI base port (possibly not used)
snprintf (buf, sizeof (buf), "%d", _ipmidi_base);
- node->add_property (X_("ipmidi-base"), buf);
+ node.add_property (X_("ipmidi-base"), buf);
+
+ node.add_property (X_("device-profile"), _device_profile.name());
+ node.add_property (X_("device-name"), _device_info.name());
+
+ XMLNode* snode = new XMLNode (X_("Surfaces"));
+ for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+ snode->add_child_nocopy ((*s)->get_state());
+ }
+
+ node.add_child_nocopy (*snode);
- node->add_property (X_("device-profile"), _device_profile.name());
- node->add_property (X_("device-name"), _device_info.name());
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state done\n");
- return *node;
+ return node;
}
int
-MackieControlProtocol::set_state (const XMLNode & node, int /*version*/)
+MackieControlProtocol::set_state (const XMLNode & node, int version)
{
- DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieControlProtocol::set_state: active %1\n", _active));
+ DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieControlProtocol::set_state: active %1\n", active()));
int retval = 0;
const XMLProperty* prop;
- uint32_t bank;
- bool active = _active;
+ uint32_t bank = 0;
if ((prop = node.property (X_("ipmidi-base"))) != 0) {
set_ipmidi_base (atoi (prop->value()));
bank = atoi (prop->value());
}
- if ((prop = node.property (X_("active"))) != 0) {
- active = string_is_affirmative (prop->value());
- }
-
if ((prop = node.property (X_("device-name"))) != 0) {
- set_device (prop->value(), false);
+ set_device_info (prop->value());
}
if ((prop = node.property (X_("device-profile"))) != 0) {
set_profile (prop->value());
}
+
+ XMLNode* snode = node.child (X_("Surfaces"));
+
+ delete _surfaces_state;
+ _surfaces_state = 0;
- set_active (active);
-
- if (_active) {
- switch_banks (bank, true);
+ if (snode) {
+ _surfaces_state = new XMLNode (*snode);
+ _surfaces_version = version;
}
+ switch_banks (bank, true);
+
+ DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::set_state done\n");
+
return retval;
}
-
-/////////////////////////////////////////////////
-// handlers for Route signals
-// TODO should these be part of RouteSignal?
-// They started off as signal/slot handlers for signals
-// from Route, but they're also used in polling for automation
-/////////////////////////////////////////////////
-
-// TODO handle plugin automation polling
string
MackieControlProtocol::format_bbt_timecode (framepos_t now_frame)
{
Timecode::BBT_Time bbt_time;
+
session->bbt_time (now_frame, bbt_time);
- // According to the Logic docs
- // digits: 888/88/88/888
- // BBT mode: Bars/Beats/Subdivisions/Ticks
+ // The Mackie protocol spec is built around a BBT time display of
+ //
+ // digits: 888/88/88/888
+ // semantics: BBB/bb/ss/ttt
+ //
+ // The third field is "subdivisions" which is a concept found in Logic
+ // but not present in Ardour. Instead Ardour displays a 4 digit tick
+ // count, which we need to spread across the 5 digits of ss/ttt.
+
ostringstream os;
+
os << setw(3) << setfill('0') << bbt_time.bars;
os << setw(2) << setfill('0') << bbt_time.beats;
-
- // figure out subdivisions per beat
- const ARDOUR::Meter & meter = session->tempo_map().meter_at (now_frame);
- int subdiv = 2;
- if (meter.note_divisor() == 8 && (meter.divisions_per_bar() == 12.0 || meter.divisions_per_bar() == 9.0 || meter.divisions_per_bar() == 6.0)) {
- subdiv = 3;
- }
-
- uint32_t subdivisions = bbt_time.ticks / uint32_t (Timecode::BBT_Time::ticks_per_beat / subdiv);
- uint32_t ticks = bbt_time.ticks % uint32_t (Timecode::BBT_Time::ticks_per_beat / subdiv);
-
- os << setw(2) << setfill('0') << subdivisions + 1;
- os << setw(3) << setfill('0') << ticks;
+ os << ' ';
+ os << setw(1) << setfill('0') << bbt_time.ticks / 1000;
+ os << setw(3) << setfill('0') << bbt_time.ticks % 1000;
return os.str();
}
// digits: 888/88/88/888
// Timecode mode: Hours/Minutes/Seconds/Frames
ostringstream os;
- os << setw(3) << setfill('0') << timecode.hours;
+ os << setw(2) << setfill('0') << timecode.hours;
+ os << ' ';
os << setw(2) << setfill('0') << timecode.minutes;
os << setw(2) << setfill('0') << timecode.seconds;
- os << setw(3) << setfill('0') << timecode.frames;
+ os << ' ';
+ os << setw(2) << setfill('0') << timecode.frames;
return os.str();
}
void
MackieControlProtocol::update_timecode_display()
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
if (surfaces.empty()) {
return;
}
boost::shared_ptr<Surface> surface = surfaces.front();
- if (surface->type() != mcu || !_device_info.has_timecode_display()) {
+ if (surface->type() != mcu || !_device_info.has_timecode_display() || !surface->active ()) {
return;
}
void
MackieControlProtocol::notify_solo_active_changed (bool active)
{
- boost::shared_ptr<Surface> surface = surfaces.front();
+ boost::shared_ptr<Surface> surface;
+
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surface = surfaces.front ();
+ }
map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Led::RudeSolo);
if (x != surface->controls_by_device_independent_id.end()) {
void
MackieControlProtocol::notify_transport_state_changed()
{
+ if (!_device_info.has_global_controls()) {
+ return;
+ }
+
// switch various play and stop buttons on / off
update_global_button (Button::Loop, session->get_play_loop());
update_global_button (Button::Play, session->transport_speed() == 1.0);
- update_global_button (Button::Stop, !session->transport_rolling());
+ update_global_button (Button::Stop, session->transport_stopped ());
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();
+ notify_metering_state_changed ();
+}
+
+void
+MackieControlProtocol::notify_metering_state_changed()
+{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+ (*s)->notify_metering_state_changed ();
+ }
}
void
MackieControlProtocol::notify_record_state_changed ()
{
- boost::shared_ptr<Surface> surface = surfaces.front();
+ if (!_device_info.has_global_controls()) {
+ return;
+ }
+
+ boost::shared_ptr<Surface> surface;
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surface = surfaces.front();
+ }
+
/* rec is a tristate */
map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Button::Record);
ls = flashing;
break;
}
-
+
surface->write (rec->set_state (ls));
}
}
MackieControlProtocol::bundles ()
{
list<boost::shared_ptr<ARDOUR::Bundle> > b;
- b.push_back (_input_bundle);
- b.push_back (_output_bundle);
+
+ if (_input_bundle) {
+ b.push_back (_input_bundle);
+ b.push_back (_output_bundle);
+ }
+
return b;
}
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::MasterFaderTouch, &MackieControlProtocol::master_fader_touch_press, &MackieControlProtocol::master_fader_touch_release);
DEFINE_BUTTON_HANDLER (Button::Snapshot, &MackieControlProtocol::snapshot_press, &MackieControlProtocol::snapshot_release);
DEFINE_BUTTON_HANDLER (Button::Read, &MackieControlProtocol::read_press, &MackieControlProtocol::read_release);
if (ioc & IO_IN) {
+ /* Devices using regular JACK MIDI ports will need to have
+ the x-thread FIFO drained to avoid burning endless CPU.
+
+ Devices using ipMIDI have port->selectable() as the same
+ file descriptor that data arrives on, so doing this
+ for them will simply throw all incoming data away.
+ */
+
+ if (!_device_info.uses_ipmidi()) {
+#ifndef PLATFORM_WINDOWS
+ CrossThreadChannel::drain (port->selectable());
+#endif
+ }
+
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name()));
- framepos_t now = session->engine().frame_time();
+ framepos_t now = session->engine().sample_time();
port->parse (now);
}
void
MackieControlProtocol::clear_ports ()
{
- _input_bundle->remove_channels ();
- _output_bundle->remove_channels ();
+ if (_input_bundle) {
+ _input_bundle->remove_channels ();
+ _output_bundle->remove_channels ();
+ }
for (PortSources::iterator i = port_sources.begin(); i != port_sources.end(); ++i) {
g_source_destroy (*i);
void
MackieControlProtocol::set_view_mode (ViewMode m)
{
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
_view_mode = m;
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
}
void
-MackieControlProtocol::set_flip_mode (bool yn)
+MackieControlProtocol::set_flip_mode (FlipMode fm)
{
- _flip_mode = yn;
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ _flip_mode = fm;
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
(*s)->update_flip_mode_display ();
return;
}
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
if ((*s)->number() == surface) {
Strip* strip = (*s)->nth_strip (strip_number);
}
void
-MackieControlProtocol::gui_track_selection_changed (ARDOUR::RouteNotificationListPtr rl)
+MackieControlProtocol::gui_track_selection_changed (ARDOUR::RouteNotificationListPtr rl, bool save_list)
{
- for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
- (*s)->gui_selection_changed (rl);
+ _gui_track_selection_changed (rl.get(), save_list);
+}
+
+void
+MackieControlProtocol::_gui_track_selection_changed (ARDOUR::RouteNotificationList* rl, bool save_list)
+{
+ /* We need to keep a list of the most recently selected routes around,
+ but we are not allowed to keep shared_ptr<Route> unless we want to
+ handle the complexities of route deletion. So instead, the GUI sends
+ us a notification using weak_ptr<Route>, which we keep a copy
+ of. For efficiency's sake, however, we convert the weak_ptr's into
+ shared_ptr<Route> before passing them to however many surfaces (and
+ thus strips) that we have.
+ */
+
+ StrongRouteNotificationList srl;
+
+ for (ARDOUR::RouteNotificationList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
+ boost::shared_ptr<ARDOUR::Route> r = (*i).lock();
+ if (r) {
+ srl.push_back (r);
+ }
+ }
+
+ {
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+ for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+ (*s)->gui_selection_changed (srl);
+ }
+ }
+
+ if (save_list) {
+ _last_selected_routes = *rl;
}
}
void
MackieControlProtocol::remove_down_select_button (int surface, int strip)
{
- DownButtonList::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(), (uint32_t) (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);
if (!routes.empty()) {
for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
- if (r == routes.begin()) {
- SetRouteSelection ((*r)->remote_control_id());
+
+ if (_modifier_state == MODIFIER_CONTROL) {
+ ToggleRouteSelection ((*r)->remote_control_id ());
} else {
- AddRouteToSelection ((*r)->remote_control_id());
+ if (r == routes.begin()) {
+ SetRouteSelection ((*r)->remote_control_id());
+ } else {
+ AddRouteToSelection ((*r)->remote_control_id());
+ }
}
}
}
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()));
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
if ((*s)->number() >= first_surface && (*s)->number() <= last_surface) {
to restart.
*/
- if (_active && _device_info.uses_ipmidi()) {
+ if (active() && _device_info.uses_ipmidi()) {
needs_ipmidi_restart = true;
}
}
-void
+int
MackieControlProtocol::ipmidi_restart ()
{
- clear_ports ();
- surfaces.clear ();
- create_surfaces ();
+ clear_surfaces ();
+ if (create_surfaces ()) {
+ return -1;
+ }
switch_banks (_current_initial_bank, true);
needs_ipmidi_restart = false;
+ return 0;
+}
+
+void
+MackieControlProtocol::clear_surfaces ()
+{
+ clear_ports ();
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ surfaces.clear ();
}