aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/mp3_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-03 18:24:01 +0100
committerMax Kellermann <max@duempel.org>2008-11-03 18:24:01 +0100
commitac96022c1de5573b9c4ff03990ac07c4bba8e3f9 (patch)
treee40cd0334b1fd332c49e7aa48f8a7dbe308c2e0f /src/decoder/mp3_plugin.c
parent8bb2da063f59e7586c61f88c1fb2d268e6191e5c (diff)
downloadmpd-ac96022c1de5573b9c4ff03990ac07c4bba8e3f9.tar.gz
mpd-ac96022c1de5573b9c4ff03990ac07c4bba8e3f9.tar.xz
mpd-ac96022c1de5573b9c4ff03990ac07c4bba8e3f9.zip
decoder_api: automatically send stream tag
If an input stream provides tags (e.g. from an icecast server), send them in the decoder_data() and decoder_tag() methods. Removed the according code from the mp3 and oggvorbis plugins - decoders shouldn't have to care about stream tags. This patch also adds the missing decoder_tag() invocation to the mp3 plugin.
Diffstat (limited to '')
-rw-r--r--src/decoder/mp3_plugin.c46
1 files changed, 5 insertions, 41 deletions
diff --git a/src/decoder/mp3_plugin.c b/src/decoder/mp3_plugin.c
index 7f742361d..f3edf9d20 100644
--- a/src/decoder/mp3_plugin.c
+++ b/src/decoder/mp3_plugin.c
@@ -942,19 +942,6 @@ mp3_synth_and_send(struct mp3_data *data, ReplayGainInfo *replay_gain_info)
return DECODE_COMMAND_STOP;
}
- if (data->input_stream->meta_title) {
- struct tag *tag = tag_new();
- if (data->input_stream->meta_name) {
- tag_add_item(tag, TAG_ITEM_NAME,
- data->input_stream->meta_name);
- }
- tag_add_item(tag, TAG_ITEM_TITLE,
- data->input_stream->meta_title);
- free(data->input_stream->meta_title);
- data->input_stream->meta_title = NULL;
- tag_free(tag);
- }
-
if (!data->decoded_first_frame) {
i = data->drop_start_samples;
data->decoded_first_frame = true;
@@ -1079,37 +1066,14 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
mp3_audio_format(&data, &audio_format);
- if (input_stream->meta_title) {
- if (tag)
- tag_free(tag);
- tag = tag_new();
- tag_add_item(tag, TAG_ITEM_TITLE, input_stream->meta_title);
- free(input_stream->meta_title);
- input_stream->meta_title = NULL;
- if (input_stream->meta_name) {
- tag_add_item(tag, TAG_ITEM_NAME,
- input_stream->meta_name);
- }
- tag_free(tag);
- } else if (tag) {
- if (input_stream->meta_name) {
- tag_clear_items_by_type(tag, TAG_ITEM_NAME);
- tag_add_item(tag, TAG_ITEM_NAME,
- input_stream->meta_name);
- }
- tag_free(tag);
- } else if (input_stream->meta_name) {
- tag = tag_new();
- if (input_stream->meta_name) {
- tag_add_item(tag, TAG_ITEM_NAME,
- input_stream->meta_name);
- }
- tag_free(tag);
- }
-
decoder_initialized(decoder, &audio_format,
data.input_stream->seekable, data.total_time);
+ if (tag != NULL) {
+ decoder_tag(decoder, input_stream, tag);
+ tag_free(tag);
+ }
+
while (mp3_read(&data, &replay_gain_info)) ;
if (replay_gain_info)