fix compilation breakages from the last commit

[ardour.git] / libs / surfaces / generic_midi / generic_midi_control_protocol.cc

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 9001b0d823d514d1e531db16d510a9dc2a6310ad..097dbc3aec845657841bc4ab4cb426684a1ce044 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -22,14 +22,14 @@
 
 #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"
@@ -77,7 +77,7 @@ GenericMidiControlProtocol::~GenericMidiControlProtocol ()
 }
 
 int
-GenericMidiControlProtocol::set_active (bool yn)
+GenericMidiControlProtocol::set_active (bool /*yn*/)
 {
        /* start/stop delivery/outbound thread */
        return 0;
@@ -139,7 +139,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
        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);
                }
@@ -150,7 +150,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
        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);
@@ -162,7 +162,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
        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;
                }
@@ -221,7 +221,7 @@ GenericMidiControlProtocol::stop_learning (Controllable* c)
        */
 
        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();
@@ -243,7 +243,7 @@ GenericMidiControlProtocol::delete_binding (PBD::Controllable* control)
                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);
                        }
@@ -323,7 +323,7 @@ GenericMidiControlProtocol::get_state ()
 }
 
 int
-GenericMidiControlProtocol::set_state (const XMLNode& node)
+GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
@@ -371,7 +371,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node)
                                
                                if (c) {
                                        MIDIControllable* mc = new MIDIControllable (*_port, *c);
-                                       if (mc->set_state (**niter) == 0) {
+                                       if (mc->set_state (**niter, version) == 0) {
                                                controllables.insert (mc);
                                        }