aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-06-09 16:58:33 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-06-09 16:58:33 +0000
commitbfaf6cbd9d3c39d466179be9fad0654cc75a4765 (patch)
tree915d4f130377ce8c2c02772862e1ef3ab2a65705 /src/player.c
parentd5f7a7745a188375c5accbbd2eb82c2776cc2a6e (diff)
downloadmpd-bfaf6cbd9d3c39d466179be9fad0654cc75a4765.tar.gz
mpd-bfaf6cbd9d3c39d466179be9fad0654cc75a4765.tar.xz
mpd-bfaf6cbd9d3c39d466179be9fad0654cc75a4765.zip
fix some streaming metadata issues
git-svn-id: https://svn.musicpd.org/mpd/trunk@1416 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/player.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/player.c b/src/player.c
index 0682a537a..4188243e6 100644
--- a/src/player.c
+++ b/src/player.c
@@ -473,11 +473,8 @@ Song * playerCurrentDecodeSong() {
Song * ret = NULL;
PlayerControl * pc = &(getPlayerData()->playerControl);
- if(pc->metadataState == PLAYER_METADATA_STATE_READ &&
- ((!song || strcmp(song->utf8url, pc->currentUrl))
- || (!prev || memcmp(prev, &(pc->metadataChunk),
- sizeof(MetadataChunk)))))
- {
+ if(pc->metadataState == PLAYER_METADATA_STATE_READ) {
+ DEBUG("playerCurrentDecodeSong: caught new metadata!\n");
if(prev) free(prev);
prev = malloc(sizeof(MetadataChunk));
memcpy(prev, &(pc->metadataChunk), sizeof(MetadataChunk));
@@ -488,9 +485,8 @@ Song * playerCurrentDecodeSong() {
song->tag = metadataChunkToMpdTagDup(prev);
validateUtf8Tag(song->tag);
ret = song;
+ resetPlayerMetadata();
}
- resetPlayerMetadata();
-
return ret;
}