#include <algorithm>
-#include <pbd/error.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
-#include <midi++/port.h>
-#include <midi++/manager.h>
+#include "midi++/port.h"
+#include "midi++/manager.h"
-#include <ardour/route.h>
-#include <ardour/session.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
#include "generic_midi_control_protocol.h"
#include "midicontrollable.h"
for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ) {
tmp = i;
++tmp;
- if (&(*i)->get_controllable() == c) {
+ if ((*i)->get_controllable() == c) {
delete (*i);
controllables.erase (i);
}
for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
ptmp = i;
++ptmp;
- if (&((*i).first)->get_controllable() == c) {
+ if (((*i).first)->get_controllable() == c) {
(*i).second.disconnect();
delete (*i).first;
pending_controllables.erase (i);
MIDIControllable* mc = 0;
for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
- if ((*i)->get_controllable().id() == c->id()) {
+ if ((*i)->get_controllable()->id() == c->id()) {
mc = *i;
break;
}
*/
for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) {
- if (&((*i).first)->get_controllable() == c) {
+ if (((*i).first)->get_controllable() == c) {
(*i).first->stop_learning ();
dptr = (*i).first;
(*i).second.disconnect();
for (MIDIControllables::iterator iter = controllables.begin(); iter != controllables.end(); ++iter) {
MIDIControllable* existingBinding = (*iter);
- if (control == &(existingBinding->get_controllable())) {
+ if (control == (existingBinding->get_controllable())) {
delete existingBinding;
controllables.erase (iter);
}