diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-31 16:54:00 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-31 17:04:40 +0100 |
| commit | d477a9222edbf48497b1225ae189408e9889f8bd (patch) | |
| tree | 1ad115a2a44ef330b1a21a0e47128f2baf68c608 | |
| parent | 69a9d2919070c2564d6e573220df71c179b57246 (diff) | |
| download | mpd-d477a9222edbf48497b1225ae189408e9889f8bd.tar.gz mpd-d477a9222edbf48497b1225ae189408e9889f8bd.tar.xz mpd-d477a9222edbf48497b1225ae189408e9889f8bd.zip | |
output/httpd: change "struct" to "class"
| -rw-r--r-- | src/output/HttpdClient.hxx | 2 | ||||
| -rw-r--r-- | src/output/HttpdInternal.hxx | 7 | ||||
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/output/HttpdClient.hxx b/src/output/HttpdClient.hxx index 78d1ac9d8..0b3da8fa9 100644 --- a/src/output/HttpdClient.hxx +++ b/src/output/HttpdClient.hxx @@ -27,7 +27,7 @@ #include <stddef.h> -struct HttpdOutput; +class HttpdOutput; class Page; class HttpdClient final : BufferedSocket { diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx index 5c9e9233e..df9099335 100644 --- a/src/output/HttpdInternal.hxx +++ b/src/output/HttpdInternal.hxx @@ -46,7 +46,7 @@ class Page; struct Encoder; struct Tag; -struct HttpdOutput final : private ServerSocket { +class HttpdOutput final : ServerSocket { struct audio_output base; /** @@ -68,6 +68,7 @@ struct HttpdOutput final : private ServerSocket { */ size_t unflushed_input; +public: /** * The MIME type produced by the #encoder. */ @@ -79,6 +80,7 @@ struct HttpdOutput final : private ServerSocket { */ mutable Mutex mutex; +private: /** * A #Timer object to synchronize this output with the * wallclock. @@ -95,6 +97,7 @@ struct HttpdOutput final : private ServerSocket { */ Page *metadata; + public: /** * The configured name. */ @@ -108,6 +111,7 @@ struct HttpdOutput final : private ServerSocket { */ char const *website; +private: /** * A linked list containing all clients which are currently * connected. @@ -126,6 +130,7 @@ struct HttpdOutput final : private ServerSocket { */ unsigned clients_max, clients_cnt; +public: HttpdOutput(EventLoop &_loop); ~HttpdOutput(); diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index 7da91e58d..63131533a 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -306,8 +306,6 @@ httpd_output_open(struct audio_output *ao, AudioFormat &audio_format, { HttpdOutput *httpd = HttpdOutput::Cast(ao); - assert(httpd->clients.empty()); - const ScopeLock protect(httpd->mutex); return httpd->Open(audio_format, error); } |