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

slightly safer copying of metadataChunk to MpdTag

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1359 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-06-06 20:34:00 +00:00
parent b29f73c819
commit 81720da06d
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/metadataChunk.c
View File

@ -11,13 +11,21 @@ void initMetadataChunk(MetadataChunk * chunk) {
chunk->title = -1;
}
#define dupElementToTag(string, element) { \
if(element >= 0 && element < METADATA_BUFFER_LENGTH) { \
string = strdup(chunk->buffer+element); \
} \
}
MpdTag * metadataChunkToMpdTagDup(MetadataChunk * chunk) {
MpdTag * ret = newMpdTag();
if(chunk->name >= 0) ret->name = strdup(chunk->buffer+chunk->name);
if(chunk->artist >= 0) ret->artist = strdup(chunk->buffer+chunk->artist);
if(chunk->album >= 0) ret->album = strdup(chunk->buffer+chunk->album);
if(chunk->title >= 0) ret->title = strdup(chunk->buffer+chunk->title);
chunk->buffer[METADATA_BUFFER_LENGTH] = '\0';
dupElementToTag(ret->name, chunk->name);
dupElementToTag(ret->title, chunk->title);
dupElementToTag(ret->artist, chunk->artist);
dupElementToTag(ret->album, chunk->album);
return ret;
}

12
src/player.c
View File

@ -478,16 +478,16 @@ Song * playerCurrentDecodeSong() {
sizeof(MetadataChunk)))))
{
printf("metadata in the PLAYER!\n");
if(song) freeJustSong(song);
song = newNullSong();
if(song->utf8url) free(song->utf8url);
song->utf8url = strdup(pc->currentUrl);
song->tag = metadataChunkToMpdTagDup(&(pc->metadataChunk));
validateUtf8Tag(song->tag);
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;
}

4
src/playlist.c
View File

@ -802,19 +802,15 @@ void syncCurrentPlayerDecodeMetadata() {
songNum = playlist.order[playlist.current];
song = playlist.songs[songNum];
printf("HERE 1\n");
if(song->type == SONG_TYPE_URL &&
0 == strcmp(song->utf8url, songPlayer->utf8url) &&
!mpdTagsAreEqual(song->tag, songPlayer->tag))
{
printf("HERE 1-1\n");
if(song->tag) freeMpdTag(song->tag);
song->tag = mpdTagDup(songPlayer->tag);
playlist.songMod[songNum] = playlist.version;
incrPlaylistVersion();
}
printf("HERE 2\n");
}
void syncPlayerAndPlaylist() {