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/SocketReader.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/SocketReader.cpp')
| -rw-r--r-- | src/socket/SocketReader.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/socket/SocketReader.cpp b/src/socket/SocketReader.cpp index 1a3e5475..9d28b405 100644 --- a/src/socket/SocketReader.cpp +++ b/src/socket/SocketReader.cpp @@ -18,9 +18,9 @@ #include <poll.h> #include "ingen/Interface.hpp" -#include "ingen/shared/AtomReader.hpp" -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/AtomReader.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/World.hpp" #include "sord/sordmm.hpp" #include "sratom/sratom.h" @@ -31,9 +31,9 @@ namespace Ingen { namespace Socket { -SocketReader::SocketReader(Ingen::Shared::World& world, - Interface& iface, - SharedPtr<Socket> sock) +SocketReader::SocketReader(Ingen::World& world, + Interface& iface, + SharedPtr<Socket> sock) : Raul::Thread("SocketReader") , _world(world) , _iface(iface) @@ -132,8 +132,7 @@ SocketReader::_run() serd_reader_start_stream(reader, f, (const uint8_t*)"(socket)", false); // Make an AtomReader to call Ingen Interface methods based on Atom - Shared::AtomReader ar( - _world.uri_map(), _world.uris(), _world.forge(), _iface); + AtomReader ar(_world.uri_map(), _world.uris(), _world.forge(), _iface); struct pollfd pfd; pfd.fd = _socket->fd(); |