smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-28 09:27:39 +01:00
Code Issues Projects Releases Wiki Activity

changes associated with save/restore of AutomationControl id's

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8111 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-11-27 17:43:32 +00:00
parent 979a61eb3f
commit 7cbcf258cc
4 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -450,7 +450,7 @@ GenericMidiControlProtocol::get_state ()
node->add_property ("binding", _current_binding);
}
XMLNode* children = new XMLNode (X_("controls"));
XMLNode* children = new XMLNode (X_("Controls"));
node->add_child_nocopy (*children);
@ -504,7 +504,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
{
Glib::Mutex::Lock lm2 (controllables_lock);
controllables.clear ();
nlist = node.children(); // "controls"
nlist = node.children(); // "Controls"
if (nlist.empty()) {
return 0;
@ -515,13 +515,17 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((prop = (*niter)->property ("id")) != 0) {
cerr << "Looking for MIDI Controllable with ID " << prop->value() << endl;
ID id = prop->value ();
c = session->controllable_by_id (id);
Controllable* c = Controllable::by_id (id);
cerr << "\tresult = " << c << endl;
if (c) {
MIDIControllable* mc = new MIDIControllable (*_input_port, *c, false);
if (mc->set_state (**niter, version) == 0) {
controllables.push_back (mc);
}