OutputPlugin: pass Tag reference to _send_tag()

2 files changed, 5 insertions, 7 deletions

diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx
index 303170268..721b6dc94 100644
--- a/src/output/plugins/httpd/HttpdInternal.hxx
+++ b/src/output/plugins/httpd/HttpdInternal.hxx
@@ -250,7 +250,7 @@ public:
 
 	bool EncodeAndPlay(const void *chunk, size_t size, Error &error);
 
-	void SendTag(const Tag *tag);
+	void SendTag(const Tag &tag);
 
 	size_t Play(const void *chunk, size_t size, Error &error);
 
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);