Mercurial > audlegacy-plugins
changeset 1758:8dd3274ec57e
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 21 Sep 2007 02:01:06 +0300 |
| parents | 3c43d2d5acd9 (diff) 99e468c53dff (current diff) |
| children | 5911d74d2954 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/sid/xs_fileinfo.c Thu Sep 20 10:37:08 2007 -0500 +++ b/src/sid/xs_fileinfo.c Fri Sep 21 02:01:06 2007 +0300 @@ -141,10 +141,7 @@ tmpNode = xs_fileinfostil->subTunes[0]; if (tmpNode) { - if (tmpNode->pName) - subName = tmpNode->pName; - else - subName = tmpNode->pTitle; + subName = tmpNode->pName; subAuthor = tmpNode->pAuthor; subInfo = tmpNode->pInfo; } else {
--- a/src/sid/xs_stil.c Thu Sep 20 10:37:08 2007 -0500 +++ b/src/sid/xs_stil.c Fri Sep 21 02:01:06 2007 +0300 @@ -262,6 +262,8 @@ default: /* Check if we are parsing an entry */ + xs_findnext(tmpLine, &linePos); + if (!tmpNode) { XS_STILDB_ERR(lineNum, tmpLine, "Entry data encountered outside of entry or syntax error!\n"); @@ -282,8 +284,10 @@ tmpNode->subTunes[subEntry]->pName = g_strdup(&tmpLine[9]); } else if (strncmp(tmpLine, " TITLE:", 8) == 0) { XS_STILDB_MULTI; - g_free(tmpNode->subTunes[subEntry]->pTitle); - tmpNode->subTunes[subEntry]->pTitle = g_strdup(&tmpLine[9]); + isMulti = TRUE; + if (!tmpNode->subTunes[subEntry]->pTitle) + tmpNode->subTunes[subEntry]->pTitle = g_strdup(&tmpLine[9]); + xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), &tmpLine[2]); } else if (strncmp(tmpLine, " AUTHOR:", 8) == 0) { XS_STILDB_MULTI; g_free(tmpNode->subTunes[subEntry]->pAuthor); @@ -296,9 +300,10 @@ XS_STILDB_MULTI; isMulti = TRUE; xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), tmpLine); - } else if (strncmp(tmpLine, " ", 8) == 0) { + } else { if (isMulti) { - xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), &tmpLine[8]); + xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), " "); + xs_pstrcat(&(tmpNode->subTunes[subEntry]->pInfo), &tmpLine[linePos]); } else { XS_STILDB_ERR(lineNum, tmpLine, "Entry continuation found when isMulti == FALSE.\n");
--- a/src/wav/wav-sndfile.c Thu Sep 20 10:37:08 2007 -0500 +++ b/src/wav/wav-sndfile.c Fri Sep 21 02:01:06 2007 +0300 @@ -114,7 +114,7 @@ tuple_associate_string(ti, FIELD_ARTIST, NULL, sf_get_string(tmp_sndfile, SF_STR_ARTIST)); tuple_associate_string(ti, FIELD_COMMENT, NULL, sf_get_string(tmp_sndfile, SF_STR_COMMENT)); - tuple_associate_string(ti, -1, "date", sf_get_string(tmp_sndfile, SF_STR_DATE)); + tuple_associate_string(ti, FIELD_DATE, NULL, sf_get_string(tmp_sndfile, SF_STR_DATE)); tuple_associate_string(ti, -1, "software", sf_get_string(tmp_sndfile, SF_STR_SOFTWARE)); g_free(realfn); realfn = NULL;