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

some fixes to metadata stuff

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1370 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-06-07 14:16:10 +00:00
parent ae44b7dae5
commit 333c0a6fdd
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/player.c
View File

@@ -470,6 +470,7 @@ void playerCycleLogFiles() {
Song * playerCurrentDecodeSong() {
static Song * song = NULL;
static MetadataChunk * prev = NULL;
Song * ret = NULL;
PlayerControl * pc = &(getPlayerData()->playerControl);
if(pc->metadataState == PLAYER_METADATA_STATE_READ &&
@@ -477,19 +478,19 @@ Song * playerCurrentDecodeSong() {
|| (!prev || memcmp(prev, &(pc->metadataChunk),
sizeof(MetadataChunk)))))
{
printf("metadata in the PLAYER!\n");
if(prev) free(prev);
prev = malloc(sizeof(MetadataChunk));
memcpy(prev, &(pc->metadataChunk), sizeof(MetadataChunk));
resetPlayerMetadata();
if(song) freeJustSong(song);
song = newNullSong();
if(song->utf8url) free(song->utf8url);
song->utf8url = strdup(pc->currentUrl);
song->tag = metadataChunkToMpdTagDup(prev);
validateUtf8Tag(song->tag);
return song;
ret = song;
}
return NULL;
resetPlayerMetadata();
return ret;
}