bug fix for metadata again, had an extra "!" in mpdTagsAreEqual()

git-svn-id: https://svn.musicpd.org/mpd/trunk@1371 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-06-07 15:00:18 +00:00
parent 333c0a6fdd
commit 608a15a885
2 changed files with 9 additions and 5 deletions

View File

@ -158,24 +158,28 @@ int copyMpdTagToOutputBuffer(OutputBuffer * cb, MpdTag * tag) {
return 0;
}
if(!last) printf("OH SHIT\n");
if(last && mpdTagsAreEqual(last, tag)) {
printf("same as last\n");
return 0;
}
sendMetaChunk = 1;
if(last) freeMpdTag(last);
last = NULL;
nextChunk = currentMetaChunk+1;
if(nextChunk >= BUFFERED_METACHUNKS) nextChunk = 0;
if(cb->metaChunkSet[nextChunk]) return -1;
sendMetaChunk = 1;
currentMetaChunk = nextChunk;
printMpdTag(stdout, tag);
if(last) freeMpdTag(last);
last = mpdTagDup(tag);
printMpdTag(stdout, last);
copyMpdTagToMetadataChunk(tag, &(cb->metadataChunks[currentMetaChunk]));
cb->metaChunkSet[nextChunk] = 1;

View File

@ -205,7 +205,7 @@ int mpdTagStringsAreEqual(char * s1, char * s2) {
int mpdTagsAreEqual(MpdTag * tag1, MpdTag * tag2) {
if(tag1 == NULL && tag2 == NULL) return 1;
else if(!tag1 || ! !tag2) return 0;
else if(!tag1 || !tag2) return 0;
if(tag1->time != tag2->time) return 0;