From 9bd4ed3e60df771241114ed460b8b5943ff57982 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 4 Jan 2014 18:21:36 +0100 Subject: [PATCH] output/httpd: use the IOThread Do all I/O in the IOThread and not in the main thread. This solves an upcoming deadlock problem. --- src/output/HttpdOutputPlugin.cxx | 4 ++-- 1 file 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)