From 629fb50716083c71146340de97eb8651679ca9fb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 31 Jul 2012 00:14:50 +0000 Subject: Merge Ingen::Shared namespace into Ingen namespace and core libingen library. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1 --- src/socket/ingen_socket_client.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/socket/ingen_socket_client.cpp') diff --git a/src/socket/ingen_socket_client.cpp b/src/socket/ingen_socket_client.cpp index b10d598e..8819ea2c 100644 --- a/src/socket/ingen_socket_client.cpp +++ b/src/socket/ingen_socket_client.cpp @@ -16,15 +16,15 @@ #include -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "raul/log.hpp" #include "Socket.hpp" #include "SocketClient.hpp" static SharedPtr -new_socket_interface(Ingen::Shared::World* world, +new_socket_interface(Ingen::World* world, const std::string& url, SharedPtr respondee) { @@ -41,8 +41,8 @@ new_socket_interface(Ingen::Shared::World* world, return SharedPtr(client); } -struct IngenSocketClientModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenSocketClientModule : public Ingen::Module { + void load(Ingen::World* world) { world->add_interface_factory("unix", &new_socket_interface); world->add_interface_factory("tcp", &new_socket_interface); } @@ -50,7 +50,7 @@ struct IngenSocketClientModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenSocketClientModule(); -- cgit v1.2.1