add ArdourSurface to OSC class to help reduce global namespace pollution

5 files changed, 8 insertions, 0 deletions

diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc
index 5390a9682a..236a1408b1 100644
--- a/libs/surfaces/osc/interface.cc
+++ b/libs/surfaces/osc/interface.cc
@@ -22,6 +22,7 @@
 #include "osc.h"
 
 using namespace ARDOUR;
+using namespace ArdourSurface;
 
 static ControlProtocol*
 new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 1fcf64bd30..ae91576c9f 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -55,6 +55,7 @@
 using namespace ARDOUR;
 using namespace std;
 using namespace Glib;
+using namespace ArdourSurface;
 
 #include "pbd/abstract_ui.cc" // instantiate template
 
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 884b89c6a2..33bcf8ea2b 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -50,6 +50,8 @@ class Route;
    certain types of requests to the OSC UI
 */
 
+namespace ArdourSurface {
+
 struct OSCUIRequest : public BaseUI::BaseRequestObject {
   public:
 	OSCUIRequest () {}
@@ -249,4 +251,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	static OSC* _instance;
 };
 
+} // namespace
+
 #endif // ardour_osc_h
diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc
index 3e6285563d..9b87ddbb64 100644
--- a/libs/surfaces/osc/osc_controllable.cc
+++ b/libs/surfaces/osc/osc_controllable.cc
@@ -30,6 +30,7 @@
 using namespace sigc;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
 
 OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr<Controllable> c)
 	: controllable (c)
diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc
index ae3e27476b..fcd7b560cb 100644
--- a/libs/surfaces/osc/osc_route_observer.cc
+++ b/libs/surfaces/osc/osc_route_observer.cc
@@ -31,6 +31,7 @@
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
 
 OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Route> r, lo_address a)
 	: _route (r)