diff options
| author | Max Kellermann <max@duempel.org> | 2013-07-30 09:04:05 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-07-30 09:04:05 +0200 |
| commit | 9a0061c511403bc023430feb91094355da83a663 (patch) | |
| tree | 7601036948af024a350f3947771375f3588442d9 /src/output/HttpdOutputPlugin.cxx | |
| parent | 7a3aac1843a9c84cd87512ef4e9bbc2def727591 (diff) | |
| download | mpd-9a0061c511403bc023430feb91094355da83a663.tar.gz mpd-9a0061c511403bc023430feb91094355da83a663.tar.xz mpd-9a0061c511403bc023430feb91094355da83a663.zip | |
encoder_api: convert to C++
Diffstat (limited to 'src/output/HttpdOutputPlugin.cxx')
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index 8c0b5f8be..2ac462842 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -22,7 +22,7 @@ #include "HttpdInternal.hxx" #include "HttpdClient.hxx" #include "OutputAPI.hxx" -#include "encoder_plugin.h" +#include "EncoderPlugin.hxx" #include "EncoderList.hxx" #include "resolver.h" #include "Page.hxx" @@ -102,8 +102,7 @@ HttpdOutput::Configure(const config_param *param, GError **error_r) const char *encoder_name = config_get_block_string(param, "encoder", "vorbis"); - const struct encoder_plugin *encoder_plugin = - encoder_plugin_get(encoder_name); + const auto encoder_plugin = encoder_plugin_get(encoder_name); if (encoder_plugin == NULL) { g_set_error(error_r, httpd_output_quark(), 0, "No such encoder: %s", encoder_name); @@ -125,7 +124,7 @@ HttpdOutput::Configure(const config_param *param, GError **error_r) /* initialize encoder */ - encoder = encoder_init(encoder_plugin, param, error_r); + encoder = encoder_init(*encoder_plugin, param, error_r); if (encoder == nullptr) return false; @@ -190,7 +189,7 @@ inline void HttpdOutput::AddClient(int fd) { clients.emplace_front(this, fd, GetEventLoop(), - encoder->plugin->tag == NULL); + encoder->plugin.tag == nullptr); ++clients_cnt; /* pass metadata to client */ @@ -489,7 +488,7 @@ HttpdOutput::SendTag(const struct tag *tag) { assert(tag != NULL); - if (encoder->plugin->tag != NULL) { + if (encoder->plugin.tag != nullptr) { /* embed encoder tags */ /* flush the current stream, and end it */ |