diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-04 18:21:36 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-04 18:21:40 +0100 |
| commit | 9bd4ed3e60df771241114ed460b8b5943ff57982 (patch) | |
| tree | c9f2334b2cfe0ebd45ad1e9e66150687afaafa22 /src/output | |
| parent | 68fcc195657fa31b47bc9504286a9b31feda92dc (diff) | |
| download | mpd-9bd4ed3e60df771241114ed460b8b5943ff57982.tar.gz mpd-9bd4ed3e60df771241114ed460b8b5943ff57982.tar.xz mpd-9bd4ed3e60df771241114ed460b8b5943ff57982.zip | |
output/httpd: use the IOThread
Do all I/O in the IOThread and not in the main thread. This solves an
upcoming deadlock problem.
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index ea75cb87d..2790dd98d 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -28,7 +28,7 @@ #include "Page.hxx" #include "IcyMetaDataServer.hxx" #include "system/fd_util.h" -#include "Main.hxx" +#include "IOThread.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" @@ -137,7 +137,7 @@ HttpdOutput::Init(const config_param ¶m, Error &error) static struct audio_output * httpd_output_init(const config_param ¶m, Error &error) { - HttpdOutput *httpd = new HttpdOutput(*main_loop); + HttpdOutput *httpd = new HttpdOutput(io_thread_get()); audio_output *result = httpd->InitAndConfigure(param, error); if (result == nullptr) |