OSC: aux bus detection fixed for mixbus

[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 b5021aa397f22680e2a1adc78fcc6c801c6a60ef..accec0451509a2988461bed5f7f31bba5015ed14 100644 (file)
--- 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,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,22 +42,23 @@ class OSCControllable : public PBD::Stateful
        lo_address address() const { return addr; }
 
        XMLNode& get_state ();
-       int set_state (const XMLNode& node, int version = 3000);
+       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
 {
 
   public:
-       OSCRouteControllable (lo_address addr, const std::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__ */