From af9092df3928ee770875a0b1acee1dc7b6347245 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 26 Dec 2014 22:30:54 +0100
Subject: EncoderPlugin: pass Tag reference to method tag()

---
 src/encoder/EncoderPlugin.hxx                  | 4 ++--
 src/encoder/plugins/VorbisEncoderPlugin.cxx    | 4 ++--
 src/output/plugins/RecorderOutputPlugin.cxx    | 2 +-
 src/output/plugins/ShoutOutputPlugin.cxx       | 2 +-
 src/output/plugins/httpd/HttpdOutputPlugin.cxx | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/encoder/EncoderPlugin.hxx b/src/encoder/EncoderPlugin.hxx
index 95e4e5838..8b0754f3f 100644
--- a/src/encoder/EncoderPlugin.hxx
+++ b/src/encoder/EncoderPlugin.hxx
@@ -65,7 +65,7 @@ struct EncoderPlugin {
 
 	bool (*pre_tag)(Encoder *encoder, Error &error);
 
-	bool (*tag)(Encoder *encoder, const Tag *tag,
+	bool (*tag)(Encoder *encoder, const Tag &tag,
 		    Error &error);
 
 	bool (*write)(Encoder *encoder,
@@ -240,7 +240,7 @@ encoder_pre_tag(Encoder *encoder, Error &error)
  * @return true on success
  */
 static inline bool
-encoder_tag(Encoder *encoder, const Tag *tag, Error &error)
+encoder_tag(Encoder *encoder, const Tag &tag, Error &error)
 {
 	assert(encoder->open);
 	assert(!encoder->pre_tag);
diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx
index 01c9910a0..253a7ce81 100644
--- a/src/encoder/plugins/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@@ -279,7 +279,7 @@ copy_tag_to_vorbis_comment(vorbis_comment *vc, const Tag &tag)
 }
 
 static bool
-vorbis_encoder_tag(Encoder *_encoder, const Tag *tag,
+vorbis_encoder_tag(Encoder *_encoder, const Tag &tag,
 		   gcc_unused Error &error)
 {
 	struct vorbis_encoder &encoder = *(struct vorbis_encoder *)_encoder;
@@ -288,7 +288,7 @@ vorbis_encoder_tag(Encoder *_encoder, const Tag *tag,
 	/* write the vorbis_comment object */
 
 	vorbis_comment_init(&comment);
-	copy_tag_to_vorbis_comment(&comment, *tag);
+	copy_tag_to_vorbis_comment(&comment, tag);
 
 	/* reset ogg_stream_state and begin a new stream */
 
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index 4dc516996..5a082538c 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -252,7 +252,7 @@ RecorderOutput::SendTag(const Tag &tag)
 	Error error;
 	if (!encoder_pre_tag(encoder, error) ||
 	    !EncoderToFile(error) ||
-	    !encoder_tag(encoder, &tag, error))
+	    !encoder_tag(encoder, tag, error))
 		LogError(error);
 }
 
diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx
index 014c246c0..1fcf48442 100644
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -498,7 +498,7 @@ static void my_shout_set_tag(AudioOutput *ao,
 		Error error;
 		if (!encoder_pre_tag(sd->encoder, error) ||
 		    !write_page(sd, error) ||
-		    !encoder_tag(sd->encoder, &tag, error)) {
+		    !encoder_tag(sd->encoder, tag, error)) {
 			LogError(error);
 			return;
 		}
diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
index 9bc2030fe..b2622e64b 100644
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -512,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
-- 
cgit v1.2.3