diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-05 02:13:21 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-05 02:13:21 +0100 |
| commit | dcbc05a9cd46e135a4e8c17b26f5f8d5505477c7 (patch) | |
| tree | 55c4cc960dd0cbdd290813321c7f96961a152a6a | |
| parent | 4c705334fa2e19155d7949286f0ad3857921f35a (diff) | |
| download | mpd-dcbc05a9cd46e135a4e8c17b26f5f8d5505477c7.tar.gz mpd-dcbc05a9cd46e135a4e8c17b26f5f8d5505477c7.tar.xz mpd-dcbc05a9cd46e135a4e8c17b26f5f8d5505477c7.zip | |
output/httpd: import GetEventLoop()
| -rw-r--r-- | src/output/HttpdInternal.hxx | 2 | ||||
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx index f20d88b4e..5a9ef8c19 100644 --- a/src/output/HttpdInternal.hxx +++ b/src/output/HttpdInternal.hxx @@ -164,6 +164,8 @@ public: #pragma GCC diagnostic pop #endif + using DeferredMonitor::GetEventLoop; + bool Init(const config_param ¶m, Error &error); void Finish() { diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index d6af03bfb..c403c97fb 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -72,7 +72,7 @@ HttpdOutput::Bind(Error &error) open = false; bool result = false; - BlockingCall(DeferredMonitor::GetEventLoop(), [this, &error, &result](){ + BlockingCall(GetEventLoop(), [this, &error, &result](){ result = ServerSocket::Open(error); }); return result; @@ -83,7 +83,7 @@ HttpdOutput::Unbind() { assert(!open); - BlockingCall(DeferredMonitor::GetEventLoop(), [this](){ + BlockingCall(GetEventLoop(), [this](){ ServerSocket::Close(); }); } @@ -167,7 +167,7 @@ httpd_output_finish(struct audio_output *ao) inline void HttpdOutput::AddClient(int fd) { - clients.emplace_front(*this, fd, ServerSocket::GetEventLoop(), + clients.emplace_front(*this, fd, GetEventLoop(), encoder->plugin.tag == nullptr); ++clients_cnt; |