diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:08:12 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:08:12 +0000 |
| commit | 45ebb851f4d0bd136b7c246a6a1b71561a6e5800 (patch) | |
| tree | 5200c82fbe3489507fe84cbf2b11645dc4a1ad1b /src/inputPlugins | |
| parent | 9cf66d0e8a7875026d7009d5df331fabf614ac55 (diff) | |
| download | mpd-45ebb851f4d0bd136b7c246a6a1b71561a6e5800.tar.gz mpd-45ebb851f4d0bd136b7c246a6a1b71561a6e5800.tar.xz mpd-45ebb851f4d0bd136b7c246a6a1b71561a6e5800.zip | |
Drop metadata updates from HTTP for now (input HTTP, and shout)
It is way more complicated than it should be; and
locking it for thread-safety is too difficult.
[merged r7183 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7241 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/mp3_plugin.c | 4 | ||||
| -rw-r--r-- | src/inputPlugins/oggvorbis_plugin.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c index 76d226b00..f6b45cd2f 100644 --- a/src/inputPlugins/mp3_plugin.c +++ b/src/inputPlugins/mp3_plugin.c @@ -893,7 +893,6 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc, data->inStream->metaTitle); free(data->inStream->metaTitle); data->inStream->metaTitle = NULL; - copyMpdTagToOutputBuffer(cb, tag); freeMpdTag(tag); } @@ -1048,21 +1047,18 @@ static int mp3_decode(OutputBuffer * cb, DecoderControl * dc, if (inStream->metaName) { addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName); } - copyMpdTagToOutputBuffer(cb, tag); freeMpdTag(tag); } else if (tag) { if (inStream->metaName) { clearItemsFromMpdTag(tag, TAG_ITEM_NAME); addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName); } - copyMpdTagToOutputBuffer(cb, tag); freeMpdTag(tag); } else if (inStream->metaName) { tag = newMpdTag(); if (inStream->metaName) { addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName); } - copyMpdTagToOutputBuffer(cb, tag); freeMpdTag(tag); } diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index 8eb075336..c79e7893c 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -213,8 +213,6 @@ static void putOggCommentsIntoOutputBuffer(OutputBuffer * cb, char *streamName, addItemToMpdTag(tag, TAG_ITEM_NAME, streamName); } - copyMpdTagToOutputBuffer(cb, tag); - freeMpdTag(tag); } |