Skip to content

M
mpd
Commit 9bd4ed3e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/httpd: use the IOThread

Do all I/O in the IOThread and not in the main thread. This solves an upcoming deadlock problem.
parent 68fcc195
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/output/HttpdOutputPlugin.cxx
View file @ 9bd4ed3e
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "Page.hxx" #include "Page.hxx"
#include "IcyMetaDataServer.hxx" #include "IcyMetaDataServer.hxx"
#include "system/fd_util.h" #include "system/fd_util.h"
#include "Main.hxx" #include "IOThread.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
...@@ -137,7 +137,7 @@ HttpdOutput::Init(const config_param &param, Error &error) ...@@ -137,7 +137,7 @@ HttpdOutput::Init(const config_param &param, Error &error)
static struct audio_output * static struct audio_output *
httpd_output_init(const config_param &param, Error &error) httpd_output_init(const config_param &param, Error &error)
{ {
HttpdOutput *httpd = new HttpdOutput(*main_loop); HttpdOutput *httpd = new HttpdOutput(io_thread_get());
audio_output *result = httpd->InitAndConfigure(param, error); audio_output *result = httpd->InitAndConfigure(param, error);
if (result == nullptr) if (result == nullptr)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment