oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

OutputPlugin: pass Tag reference to _send_tag()

Browse Source
This commit is contained in:
Max Kellermann
2014-12-26 22:27:01 +01:00
parent 7077eac589
commit 58a5da33c2
8 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

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