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

Merged with trunk R1705.

Browse source 
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).


git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-04-12 23:20:37 +00:00
parent 96ca08b925
commit 959a7909c1
126 changed files with 10459 additions and 9679 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,6 +129,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) {
@ -144,11 +168,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 ();
@ -161,10 +186,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);
@ -181,18 +214,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;
}
}