Mercurial > hg > xmms-sid
changeset 541:e795d8e73ebc
More Audacious compatibility glue.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 21 Feb 2007 05:38:05 +0000 |
| parents | 3e4901a89f3d |
| children | 48fdc91bfea2 |
| files | src/xs_title.c |
| diffstat | 1 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xs_title.c Wed Feb 21 03:39:00 2007 +0000 +++ b/src/xs_title.c Wed Feb 21 05:38:05 2007 +0000 @@ -75,15 +75,15 @@ pResult->file_ext = tmpFileExt; pResult->file_path = tmpFilePath; - pResult->track_name = p->sidName; + pResult->track_name = g_strdup(p->sidName); pResult->track_number = subTune; pResult->album_name = NULL; - pResult->performer = p->sidComposer; - pResult->date = (p->sidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580"; + pResult->performer = g_strdup(p->sidComposer); + pResult->date = g_strdup((p->sidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580"); pResult->year = 0; - pResult->genre = "SID-tune"; - pResult->comment = p->sidCopyright; + pResult->genre = g_strdup("SID-tune"); + pResult->comment = g_strdup(p->sidCopyright); return pResult; } @@ -91,19 +91,11 @@ #ifdef AUDACIOUS_PLUGIN TitleInput * xs_make_titletuple(t_xs_tuneinfo *p, gint subTune) { - TitleInput *pResult; gchar *tmpFilename, *tmpFilePath, *tmpFileExt; - xs_path_split(p->sidFilename, &tmpFilename, - &tmpFilePath, &tmpFileExt); + xs_path_split(p->sidFilename, &tmpFilename, &tmpFilePath, &tmpFileExt); - pResult = xs_get_titletuple(tmpFilename, tmpFilePath, - tmpFileExt, p, subTune); - - g_free(tmpFilename); - g_free(tmpFilePath); - - return pResult; + return xs_get_titletuple(tmpFilename, tmpFilePath, tmpFileExt, p, subTune); } #endif #endif @@ -151,6 +143,13 @@ tmpFilename, tmpFilePath, tmpFileExt, p, subTune); pcResult = xmms_get_titlestring(xmms_get_gentitle_format(), pTuple); + + g_free(pTuple->track_name); + g_free(pTuple->album_name); + g_free(pTuple->performer); + g_free(pTuple->date); + g_free(pTuple->genre); + g_free(pTuple->comment); g_free(pTuple); } else #endif