ardour/livetrax
13
0
Fork 0
Code

A fix to make MIDI controller state save properly, also fixed a bind cancel related segfault. (hopefully)

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1669 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sampo Savolainen 2007-04-05 22:10:28 +00:00
parent 6bd31cc7a3
commit d4a73c373a
2 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View File

@ -125,6 +125,30 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
return false;
}
MIDIControllables::iterator tmp;
for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ) {
tmp = i;
++tmp;
if (&(*i)->get_controllable() == c) {
delete (*i);
controllables.erase (i);
}
i = tmp;
}
MIDIPendingControllables::iterator ptmp;
for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
ptmp = i;
++ptmp;
if (&((*i).first)->get_controllable() == c) {
(*i).second.disconnect();
delete (*i).first;
pending_controllables.erase (i);
}
i = ptmp;
}
MIDIControllable* mc = 0;
for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
@ -140,11 +164,12 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
{
Glib::Mutex::Lock lm (pending_lock);
std::pair<MIDIControllables::iterator,bool> result;
result = pending_controllables.insert (mc);
if (result.second) {
c->LearningFinished.connect (bind (mem_fun (*this, &GenericMidiControlProtocol::learning_stopped), mc));
}
std::pair<MIDIControllable *, sigc::connection> element;
element.first = mc;
element.second = c->LearningFinished.connect (bind (mem_fun (*this, &GenericMidiControlProtocol::learning_stopped), mc));
pending_controllables.push_back (element);
}
mc->learn_about_external_control ();
@ -157,10 +182,18 @@ GenericMidiControlProtocol::learning_stopped (MIDIControllable* mc)
Glib::Mutex::Lock lm (pending_lock);
Glib::Mutex::Lock lm2 (controllables_lock);
MIDIControllables::iterator i = find (pending_controllables.begin(), pending_controllables.end(), mc);
MIDIPendingControllables::iterator tmp;
if (i != pending_controllables.end()) {
pending_controllables.erase (i);
for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
tmp = i;
++tmp;
if ( (*i).first == mc) {
(*i).second.disconnect();
pending_controllables.erase(i);
}
i = tmp;
}
controllables.insert (mc);
@ -177,18 +210,13 @@ GenericMidiControlProtocol::stop_learning (Controllable* c)
relevant MIDIControllable and remove it from the pending list.
*/
for (MIDIControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) {
if (&(*i)->get_controllable() == c) {
(*i)->stop_learning ();
dptr = *i;
pending_controllables.erase (i);
break;
}
}
for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) {
if (&((*i).first)->get_controllable() == c) {
(*i).first->stop_learning ();
dptr = (*i).first;
(*i).second.disconnect();
for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
if (&(*i)->get_controllable() == c) {
controllables.erase (i);
pending_controllables.erase (i);
break;
}
}

4
libs/surfaces/generic_midi/generic_midi_control_protocol.h
View File

@ -49,7 +49,9 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
typedef std::set<MIDIControllable*> MIDIControllables;
MIDIControllables controllables;
MIDIControllables pending_controllables;
typedef std::list<std::pair<MIDIControllable*,sigc::connection> > MIDIPendingControllables;
MIDIPendingControllables pending_controllables;
Glib::Mutex controllables_lock;
Glib::Mutex pending_lock;