aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/plugins/httpd/HttpdOutputPlugin.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 22:27:01 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 22:27:01 +0100
commit58a5da33c243c057ac4f70ffcfa179b9710161d2 (patch)
tree389077b8e9f78c001daf40a8e1b1d7bd562414c4 /src/output/plugins/httpd/HttpdOutputPlugin.cxx
parent7077eac589bf828188e7dbcfb4ac6002203063d4 (diff)
downloadmpd-58a5da33c243c057ac4f70ffcfa179b9710161d2.tar.gz
mpd-58a5da33c243c057ac4f70ffcfa179b9710161d2.tar.xz
mpd-58a5da33c243c057ac4f70ffcfa179b9710161d2.zip
OutputPlugin: pass Tag reference to _send_tag()
Diffstat (limited to 'src/output/plugins/httpd/HttpdOutputPlugin.cxx')
-rw-r--r--src/output/plugins/httpd/HttpdOutputPlugin.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
index e3ba7727d..9bc2030fe 100644
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -499,10 +499,8 @@ httpd_output_pause(AudioOutput *ao)
}
inline void
-HttpdOutput::SendTag(const Tag *tag)
+HttpdOutput::SendTag(const Tag &tag)
{
- assert(tag != nullptr);
-
if (encoder->plugin.tag != nullptr) {
/* embed encoder tags */
@@ -514,7 +512,7 @@ HttpdOutput::SendTag(const Tag *tag)
/* send the tag to the encoder - which starts a new
stream now */
- encoder_tag(encoder, tag, IgnoreError());
+ encoder_tag(encoder, &tag, IgnoreError());
/* the first page generated by the encoder will now be
used as the new "header" page, which is sent to all
@@ -538,7 +536,7 @@ HttpdOutput::SendTag(const Tag *tag)
TAG_NUM_OF_ITEM_TYPES
};
- metadata = icy_server_metadata_page(*tag, &types[0]);
+ metadata = icy_server_metadata_page(tag, &types[0]);
if (metadata != nullptr) {
const ScopeLock protect(mutex);
for (auto &client : clients)
@@ -548,7 +546,7 @@ HttpdOutput::SendTag(const Tag *tag)
}
static void
-httpd_output_tag(AudioOutput *ao, const Tag *tag)
+httpd_output_tag(AudioOutput *ao, const Tag &tag)
{
HttpdOutput *httpd = HttpdOutput::Cast(ao);