Mercurial > audlegacy
changeset 1354:a0b8858c0342 trunk
[svn] - tuple builder for PSF files
| author | nenolod |
|---|---|
| date | Wed, 28 Jun 2006 18:53:47 -0700 |
| parents | 35ef03569852 |
| children | 2a69c94320e6 |
| files | ChangeLog Plugins/Input/sexypsf/xmms.c |
| diffstat | 2 files changed, 34 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 28 18:21:25 2006 -0700 +++ b/ChangeLog Wed Jun 28 18:53:47 2006 -0700 @@ -1,3 +1,13 @@ +2006-06-29 01:21:25 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [1618] + Hook up Altivec-enabled DCT64 for MP3. WMA throws a tantrum on Altivec machines. Submit a patch, or wait for me to fix it. + + Changes: Modified: + +1 -1 trunk/Plugins/Input/mpg123/Makefile.in + +12 -2 trunk/configure.ac + +1 -0 trunk/mk/rules.mk.in + + 2006-06-28 22:32:15 +0000 William Pitcock <nenolod@nenolod.net> revision [1616] - GList cannot handle circular queues, so I integrated one into CategoryQueueEntry. No fuss, no muss.
--- a/Plugins/Input/sexypsf/xmms.c Wed Jun 28 18:21:25 2006 -0700 +++ b/Plugins/Input/sexypsf/xmms.c Wed Jun 28 18:53:47 2006 -0700 @@ -48,7 +48,7 @@ InputPlugin *get_iplugin_info(void) { - sexypsf_ip.description = "sexyPSF PSF1 Player 0.4.8"; + sexypsf_ip.description = "PSF Module Decoder"; return &sexypsf_ip; } @@ -230,24 +230,31 @@ } } +static TitleInput *get_tuple_psf(gchar *fn) { + TitleInput *tuple = NULL; + PSFINFO *tmp = sexypsf_getpsfinfo(fn); + + if (tmp->length) { + tuple = bmp_title_input_new(); + tuple->length = tmp->length; + tuple->performer = g_strdup(tmp->artist); + tuple->album_name = g_strdup(tmp->game); + tuple->track_name = g_strdup(tmp->title); + tuple->file_name = g_path_get_basename(fn); + tuple->file_path = g_path_get_dirname(fn); + } + + return tuple; +} + static gchar *get_title_psf(gchar *fn) { gchar *title; - PSFINFO *tmp = sexypsf_getpsfinfo(fn); - - if (tmp->length) { - TitleInput *tinput; - - tinput = bmp_title_input_new(); - - tinput->performer = g_strdup(tmp->artist); - tinput->album_name = g_strdup(tmp->game); - tinput->track_name = g_strdup(tmp->title); - tinput->file_name = g_path_get_basename(fn); - tinput->file_path = g_path_get_dirname(fn); - + TitleInput *tinput = get_tuple_psf(fn); + + if (tinput != NULL) { title = xmms_get_titlestring(xmms_get_gentitle_format(), tinput); - g_free(tinput); + bmp_title_input_free(tinput); } else title = g_path_get_basename(fn); @@ -280,5 +287,6 @@ 0, sexypsf_xmms_getsonginfo, 0, - 0 + 0, + get_tuple_psf };