add ArdourSurface to OSC class to help reduce global namespace pollution

This commit is contained in:
Paul Davis
2015-04-15 17:21:47 -04:00
parent 69e41c3b38
commit 7f659a0463
5 changed files with 8 additions and 0 deletions

View File

@@ -22,6 +22,7 @@
#include "osc.h"
using namespace ARDOUR;
using namespace ArdourSurface;
static ControlProtocol*
new_osc_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)

View File

@@ -55,6 +55,7 @@
using namespace ARDOUR;
using namespace std;
using namespace Glib;
using namespace ArdourSurface;
#include "pbd/abstract_ui.cc" // instantiate template

View File

@@ -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

View File

@@ -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)

View File

@@ -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)