summaryrefslogtreecommitdiffstats
path: root/src/engine/OSCEngineReceiver.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-18 12:47:15 +0000
committerDavid Robillard <d@drobilla.net>2011-04-18 12:47:15 +0000
commit8ba6bb943889bfdd58cf4a971a152041c1199cfe (patch)
tree91fbe8577e6d01070aa81f532ddd8102db1476f5 /src/engine/OSCEngineReceiver.cpp
parent3cd3bfe5079f84fafb7dc217f5393d6ba947109c (diff)
downloadingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.tar.gz
ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.tar.bz2
ingen-8ba6bb943889bfdd58cf4a971a152041c1199cfe.zip
Put engine code in new Ingen::Engine namespace.
Put core interfaces in Ingen namespace (not Ingen::Shared). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3159 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/OSCEngineReceiver.cpp')
-rw-r--r--src/engine/OSCEngineReceiver.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 0babfc10..baa6d5e1 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -44,8 +44,7 @@ using namespace std;
using namespace Raul;
namespace Ingen {
-
-using namespace Shared;
+namespace Engine {
/*! \page engine_osc_namespace Engine OSC Namespace Documentation
*
@@ -209,7 +208,7 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types,
/* Different address than last time, have to do a lookup */
if (!r || !r->client() || strcmp(url, r->client()->uri().c_str())) {
- Shared::ClientInterface* client = me->_engine.broadcaster()->client(url);
+ ClientInterface* client = me->_engine.broadcaster()->client(url);
if (client)
me->_request = SharedPtr<Request>(new Request(me, client, id));
else
@@ -315,7 +314,7 @@ OSCEngineReceiver::_register_client_cb(const char* path, const char* types, lo_a
lo_address addr = lo_message_get_source(msg);
char* const url = lo_address_get_url(addr);
- Shared::ClientInterface* client = new OSCClientSender((const char*)url);
+ ClientInterface* client = new OSCClientSender((const char*)url);
register_client(client);
free(url);
@@ -641,4 +640,5 @@ OSCEngineReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv
return 0;
}
+} // namespace Engine
} // namespace Ingen