diff options
author | David Robillard <d@drobilla.net> | 2012-05-10 03:23:11 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-05-10 03:23:11 +0000 |
commit | da468f24388d7f0f574c6e4dd4022e05d47a9db2 (patch) | |
tree | 32e90d5fa55a35caef43cb69592286fc31c5d4f4 /src/socket/SocketServer.hpp | |
parent | 281bbcc6a7208c28283bc9bdd521c5d6cc48a60f (diff) | |
download | ingen-da468f24388d7f0f574c6e4dd4022e05d47a9db2.tar.gz ingen-da468f24388d7f0f574c6e4dd4022e05d47a9db2.tar.bz2 ingen-da468f24388d7f0f574c6e4dd4022e05d47a9db2.zip |
Use SharedPtr references to Interfaces to keep things sane.
Fix double register when using GUI with a remote engine.
Avoid signal when writing to dead socket by using send with MSG_NOSIGNAL.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4336 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/socket/SocketServer.hpp')
-rw-r--r-- | src/socket/SocketServer.hpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/socket/SocketServer.hpp b/src/socket/SocketServer.hpp index 8ea0f445..55434030 100644 --- a/src/socket/SocketServer.hpp +++ b/src/socket/SocketServer.hpp @@ -34,17 +34,23 @@ public: SharedPtr<Socket> sock) : Server::EventWriter(engine) , SocketReader(world, *this, sock) - , _writer(*world.lv2_uri_map().get(), - *world.uris().get(), - sock->uri(), - sock) + , _engine(engine) + , _writer(new SocketWriter(*world.lv2_uri_map().get(), + *world.uris().get(), + sock->uri(), + sock)) { - set_respondee(&_writer); - engine.register_client(sock->uri(), &_writer); + set_respondee(_writer); + engine.register_client(_writer->uri(), _writer); + } + + ~SocketServer() { + _engine.unregister_client(_writer->uri()); } private: - SocketWriter _writer; + Server::Engine& _engine; + SharedPtr<SocketWriter> _writer; }; } // namespace Ingen |