smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

fix MCP ports hang on device change and multi-surface device reconnect.

Browse source
This commit is contained in:
Len Ovens 2015-10-13 22:19:36 -07:00
parent 53a28c230a
commit 1f85691870
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -809,7 +809,7 @@ MackieControlProtocol::create_surfaces ()
XMLNodeList const& devices = configuration_state->children(); XMLNodeList const& devices = configuration_state->children();
for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) { for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
XMLProperty* prop = (*d)->property (X_("name")); XMLProperty* prop = (*d)->property (X_("name"));
if (prop && prop->value() == device_name) { if (prop && prop->value() == _device_info.name()) {
this_device = *d; this_device = *d;
break; break;
} }

4
libs/surfaces/mackie/surface.cc
View file

@ -166,7 +166,9 @@ Surface::~Surface ()
delete _jog_wheel; delete _jog_wheel;
delete _port; delete _port;
// the ports take time to release and we may be rebuilding right away
// in the case of changing devices.
g_usleep (100000);
DEBUG_TRACE (DEBUG::MackieControl, "Surface::~Surface done\n"); DEBUG_TRACE (DEBUG::MackieControl, "Surface::~Surface done\n");
} }