MCP: probably fix crash on solo, another debug trace

[ardour.git] / libs / surfaces / osc / osc_controllable.h

diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h
index 4b10dbc39eb6a25653184210ce92de8c69d0b657..828c3769f570a23c4412f5d8e098d8bcfbff0fea 100644 (file)
--- a/libs/surfaces/osc/osc_controllable.h
+++ b/libs/surfaces/osc/osc_controllable.h
@@ -25,14 +25,12 @@
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
-#include <pbd/controllable.h>
-#include <pbd/stateful.h>
-#include <ardour/types.h>
+#include "pbd/controllable.h"
+#include "pbd/stateful.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
-
-class Route;
-
+       class Route;
 }
 
 class OSCControllable : public PBD::Stateful
@@ -44,14 +42,15 @@ class OSCControllable : public PBD::Stateful
        lo_address address() const { return addr; }
 
        XMLNode& get_state ();
-       int set_state (const XMLNode& node);
+       int set_state (const XMLNode& node, int version);
 
   protected:
        boost::shared_ptr<PBD::Controllable> controllable;
+       PBD::ScopedConnection changed_connection;
        lo_address addr;
        std::string path;
 
-       virtual void send_change ();
+       virtual void send_change_message ();
 };
 
 class OSCRouteControllable : public OSCControllable
@@ -68,7 +67,7 @@ class OSCRouteControllable : public OSCControllable
   private:
        boost::shared_ptr<ARDOUR::Route> _route;
 
-       void send_change ();
+       void send_change_message ();
 };
 
 #endif /* __osc_osccontrollable_h__ */