smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-21 12:55:57 +01:00
Code Issues Projects Releases Wiki Activity

forward part the backend part of the generic MIDI control fixes from mb2/a2

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13297 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-17 14:36:40 +00:00
parent f4ae7cc709
commit cff8a65db2
4 changed files with 41 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/control_protocol_manager.h
View file

@ -72,11 +72,11 @@ class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandl
static const std::string state_node_name;
void set_protocol_states (const XMLNode&);
int set_state (const XMLNode&, int version);
XMLNode& get_state (void);
sigc::signal<void,ControlProtocolInfo*> ProtocolStatusChange;
private:
ControlProtocolManager ();
static ControlProtocolManager* _instance;

82
libs/ardour/control_protocol_manager.cc
View file

@ -139,6 +139,8 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
control_protocols.push_back (cpi.protocol);
ProtocolStatusChange (&cpi);
return cpi.protocol;
}
@ -173,6 +175,9 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
delete cpi.state;
cpi.state = 0;
dlclose (cpi.descriptor->module);
ProtocolStatusChange (&cpi);
return 0;
}
@ -326,30 +331,43 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
for (citer = clist.begin(); citer != clist.end(); ++citer) {
if ((*citer)->name() == X_("Protocol")) {
prop = (*citer)->property (X_("active"));
if ((prop = (*citer)->property (X_("active"))) == 0) {
continue;
}
if (prop && string_is_affirmative (prop->value())) {
if ((prop = (*citer)->property (X_("name"))) != 0) {
ControlProtocolInfo* cpi = cpi_by_name (prop->value());
bool active = string_is_affirmative (prop->value());
if ((prop = (*citer)->property (X_("name"))) == 0) {
continue;
}
if (cpi) {
if (cpi->state) {
delete cpi->state;
}
cpi->state = new XMLNode (**citer);
if (_session) {
instantiate (*cpi);
} else {
cpi->requested = true;
}
ControlProtocolInfo* cpi = cpi_by_name (prop->value());
if (cpi) {
if (!(*citer)->children().empty()) {
cpi->state = new XMLNode (*((*citer)->children().front ()));
} else {
cpi->state = 0;
}
if (active) {
if (_session) {
instantiate (*cpi);
} else {
cpi->requested = true;
}
} else {
if (_session) {
teardown (*cpi);
} else {
cpi->requested = false;
}
}
}
}
}
return 0;
}
@ -382,36 +400,6 @@ ControlProtocolManager::get_state ()
return *root;
}
void
ControlProtocolManager::set_protocol_states (const XMLNode& node)
{
XMLNodeList nlist;
XMLNodeConstIterator niter;
XMLProperty* prop;
nlist = node.children();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
XMLNode* child = (*niter);
if ((prop = child->property ("name")) == 0) {
error << _("control protocol XML node has no name property. Ignored.") << endmsg;
continue;
}
ControlProtocolInfo* cpi = cpi_by_name (prop->value());
if (!cpi) {
warning << string_compose (_("control protocol \"%1\" is not known. Ignored"), prop->value()) << endmsg;
continue;
}
/* copy the node so that ownership is clear */
cpi->state = new XMLNode (*child);
}
}
ControlProtocolManager&
ControlProtocolManager::instance ()

4
libs/ardour/session_state.cc
View file

@ -1386,8 +1386,8 @@ Session::set_state (const XMLNode& node, int version)
}
}
if ((child = find_named_node (node, "ControlProtocols")) != 0) {
ControlProtocolManager::instance().set_protocol_states (*child);
if ((child = find_named_node (node, ControlProtocolManager::state_node_name)) != 0) {
ControlProtocolManager::instance().set_state (*child, version);
}
update_have_rec_enabled_track ();

6
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View file

@ -539,13 +539,11 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
Glib::Threads::Mutex::Lock lm2 (controllables_lock);
controllables.clear ();
nlist = node.children(); // "Controls"
if (nlist.empty()) {
return 0;
}
nlist = nlist.front()->children ();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((prop = (*niter)->property ("id")) != 0) {