diff options
author | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
commit | 629fb50716083c71146340de97eb8651679ca9fb (patch) | |
tree | 9c5f25fdfd24f3cdb89924062f291a6647580878 /src/socket/ingen_socket_client.cpp | |
parent | 6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff) | |
download | ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2 ingen-629fb50716083c71146340de97eb8651679ca9fb.zip |
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
Diffstat (limited to 'src/socket/ingen_socket_client.cpp')
-rw-r--r-- | src/socket/ingen_socket_client.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 <string> -#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<Ingen::Interface> -new_socket_interface(Ingen::Shared::World* world, +new_socket_interface(Ingen::World* world, const std::string& url, SharedPtr<Ingen::Interface> respondee) { @@ -41,8 +41,8 @@ new_socket_interface(Ingen::Shared::World* world, return SharedPtr<Ingen::Interface>(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(); |