output/httpd: change "struct" to "class"

This commit is contained in:
Max Kellermann 2013-12-31 16:54:00 +01:00
parent 69a9d29190
commit d477a9222e
3 changed files with 7 additions and 4 deletions

View File

@ -27,7 +27,7 @@
#include <stddef.h>
struct HttpdOutput;
class HttpdOutput;
class Page;
class HttpdClient final : BufferedSocket {

View File

@ -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();

View File

@ -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);
}