X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_controllable.h;h=accec0451509a2988461bed5f7f31bba5015ed14;hb=06ea56a2ce2fb8cf7e6803486292bf7b89d81de7;hp=61261a8f1c40bfdc750c295148b391e52ad528c7;hpb=70b939da4f9d4097160e32f2373a7a5ff8f4957f;p=ardour.git

diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h
index 61261a8f1c..accec04515 100644
--- a/libs/surfaces/osc/osc_controllable.h
+++ b/libs/surfaces/osc/osc_controllable.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2009 Paul Davis
- 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -25,41 +25,40 @@
 #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
 {
   public:
-	OSCControllable (lo_address addr, const string& path, boost::shared_ptr<PBD::Controllable>);
+	OSCControllable (lo_address addr, const std::string& path, boost::shared_ptr<PBD::Controllable>);
 	virtual ~OSCControllable ();
 
 	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;
-	string path;
+	std::string path;
 
-	virtual void send_change ();
+	virtual void send_change_message ();
 };
 
 class OSCRouteControllable : public OSCControllable
 {
 
   public:
-	OSCRouteControllable (lo_address addr, const string& path, 
-			      boost::shared_ptr<PBD::Controllable>, 
+	OSCRouteControllable (lo_address addr, const std::string& path,
+			      boost::shared_ptr<PBD::Controllable>,
 			      boost::shared_ptr<ARDOUR::Route>);
 	~OSCRouteControllable ();
 
@@ -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__ */