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

EncoderPlugin: pass Tag reference to method tag()

Browse Source
This commit is contained in:
Max Kellermann 2014-12-26 22:30:54 +01:00
parent 58a5da33c2
commit af9092df39
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/encoder/EncoderPlugin.hxx
View File

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

4
src/encoder/plugins/VorbisEncoderPlugin.cxx
View File

@ -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 */

2
src/output/plugins/RecorderOutputPlugin.cxx
View File

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

2
src/output/plugins/ShoutOutputPlugin.cxx
View File

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

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

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

2
test/test_vorbis_encoder.cxx
View File

@ -90,7 +90,7 @@ main(gcc_unused int argc, gcc_unused char **argv)
tag_builder.Commit(tag);
}
success = encoder_tag(encoder, &tag, IgnoreError());
success = encoder_tag(encoder, tag, IgnoreError());
assert(success);
encoder_to_stdout(*encoder);