Mercurial > hg > xmms-sid
diff src/xs_fileinfo.c @ 657:acaba070cf49
Lots of cosmetic code cleanups; synced the de-gettextification from Audacious-SID, I suppose it makes some sense ...
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 02 Apr 2008 19:46:59 +0300 |
parents | 7de614ecb7b6 |
children | b0743dc9165d |
line wrap: on
line diff
--- a/src/xs_fileinfo.c Wed Mar 26 08:55:29 2008 +0200 +++ b/src/xs_fileinfo.c Wed Apr 02 19:46:59 2008 +0300 @@ -33,7 +33,7 @@ static GtkWidget *xs_fileinfowin = NULL; -static t_xs_stil_node *xs_fileinfostil = NULL; +static stil_node_t *xs_fileinfostil = NULL; XS_MUTEX(xs_fileinfowin); #define LUW(x) lookup_widget(xs_fileinfowin, x) @@ -120,7 +120,7 @@ static void xs_fileinfo_subtune(GtkWidget * widget, void *data) { - t_xs_stil_subnode *tmpNode; + stil_subnode_t *tmpNode; GtkWidget *tmpText; gchar *subName, *subAuthor, *subInfo; @@ -136,14 +136,14 @@ #endif /* Get subtune information */ - tmpNode = (t_xs_stil_subnode *) data; + tmpNode = (stil_subnode_t *) data; if (!tmpNode && xs_fileinfostil) tmpNode = xs_fileinfostil->subTunes[0]; if (tmpNode) { - subName = tmpNode->pName; - subAuthor = tmpNode->pAuthor; - subInfo = tmpNode->pInfo; + subName = tmpNode->name; + subAuthor = tmpNode->author; + subInfo = tmpNode->info; } else { subName = NULL; subAuthor = NULL; @@ -170,8 +170,8 @@ void xs_fileinfo(gchar * pcFilename) { GtkWidget *tmpMenuItem, *tmpMenu, *tmpOptionMenu; - t_xs_tuneinfo *tmpInfo; - t_xs_stil_subnode *tmpNode; + xs_tuneinfo_t *tmpInfo; + stil_subnode_t *tmpNode; gchar tmpStr[256], *tmpFilename; gint n; @@ -246,18 +246,18 @@ g_snprintf(tmpStr, sizeof(tmpStr), _("Tune #%i: "), n); - if (tmpNode->pName) { - xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pName); + if (tmpNode->name) { + xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->name); isSet = TRUE; } - if (tmpNode->pTitle) { + if (tmpNode->title) { xs_pnstrcat(tmpStr, sizeof(tmpStr), - isSet ? " [*]" : tmpNode->pTitle); + isSet ? " [*]" : tmpNode->title); isSet = TRUE; } - if (tmpNode->pInfo) { + if (tmpNode->info) { xs_pnstrcat(tmpStr, sizeof(tmpStr), " [!]"); isSet = TRUE; }