From e77d4fcf31bfdad0b34e184e4743b4750848472c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 May 2012 01:29:18 +0000 Subject: Use more reasonable names for the world's interface and engine (if present). Don't require separate Configuration initialisation from World (simplify API). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4343 a436a847-0d15-0410-975c-d299462d15a1 --- src/socket/SocketListener.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/socket') diff --git a/src/socket/SocketListener.cpp b/src/socket/SocketListener.cpp index fa58ff44..6861a717 100644 --- a/src/socket/SocketListener.cpp +++ b/src/socket/SocketListener.cpp @@ -44,7 +44,7 @@ SocketListener::SocketListener(Ingen::Shared::World& world) set_name("SocketListener"); // Create UNIX socket - _unix_path = world.conf()->option("socket").get_string(); + _unix_path = world.conf().option("socket").get_string(); const std::string unix_uri = "unix://" + _unix_path; if (!_unix_sock.bind(unix_uri) || !_unix_sock.listen()) { LOG(Raul::error) << "Failed to create UNIX socket" << std::endl; @@ -52,7 +52,7 @@ SocketListener::SocketListener(Ingen::Shared::World& world) } // Create TCP socket - int port = world.conf()->option("engine-port").get_int(); + int port = world.conf().option("engine-port").get_int(); std::ostringstream ss; ss << "tcp:///localhost:"; ss << port; @@ -76,7 +76,7 @@ SocketListener::~SocketListener() void SocketListener::_run() { - Server::Engine* engine = (Server::Engine*)_world.local_engine().get(); + Server::Engine* engine = (Server::Engine*)_world.engine().get(); struct pollfd pfds[2]; int nfds = 0; -- cgit v1.2.1