diff options
Diffstat (limited to 'src/Listen.cxx')
| -rw-r--r-- | src/Listen.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/Listen.cxx b/src/Listen.cxx index d5c132545..731f51196 100644 --- a/src/Listen.cxx +++ b/src/Listen.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2013 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -21,10 +21,10 @@ #include "Listen.hxx" #include "Main.hxx" #include "Instance.hxx" -#include "Client.hxx" -#include "ConfigData.hxx" -#include "ConfigGlobal.hxx" -#include "ConfigOption.hxx" +#include "client/Client.hxx" +#include "config/ConfigData.hxx" +#include "config/ConfigGlobal.hxx" +#include "config/ConfigOption.hxx" #include "event/ServerSocket.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" @@ -44,12 +44,12 @@ static constexpr Domain listen_domain("listen"); class ClientListener final : public ServerSocket { public: - ClientListener():ServerSocket(*main_loop) {} + ClientListener(EventLoop &_loop):ServerSocket(_loop) {} private: virtual void OnAccept(int fd, const sockaddr &address, size_t address_length, int uid) { - client_new(*main_loop, *instance->partition, + client_new(GetEventLoop(), *instance->partition, fd, &address, address_length, uid); } }; @@ -101,16 +101,14 @@ listen_systemd_activation(Error &error_r) } bool -listen_global_init(Error &error) +listen_global_init(EventLoop &loop, Error &error) { - assert(main_loop != nullptr); - int port = config_get_positive(CONF_PORT, DEFAULT_PORT); const struct config_param *param = config_get_next_param(CONF_BIND_TO_ADDRESS, nullptr); bool success; - listen_socket = new ClientListener(); + listen_socket = new ClientListener(loop); if (listen_systemd_activation(error)) return true; |