Mercurial > audlegacy
changeset 3584:4f99a9e270cf trunk
Automated merge with ssh://hg.atheme.org//hg/audacious
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 19 Sep 2007 17:47:30 +0300 |
parents | d3ba8bcf9fd6 (diff) cfb56cc47f9f (current diff) |
children | 8e50c2cd44f0 fe3a1ae77f80 |
files | |
diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/playlist.c Wed Sep 19 18:41:39 2007 +0900 +++ b/src/audacious/playlist.c Wed Sep 19 17:47:30 2007 +0300 @@ -676,17 +676,17 @@ if (tuple != NULL) { subtunes_num = tuple_get_int(tuple, FIELD_SUBSONG_NUM, NULL); - if ( subtunes_num > 0 ) + if (subtunes_num > 0) { i = 1; tuple_free(tuple); /* will be replaced by subtune tuples */ } } - for ( ; i <= subtunes_num ; i++ ) + for (; i <= subtunes_num; i++) { gchar *filename_entry; - if ( subtunes_num > 0 ) + if (subtunes_num > 0) { filename_entry = g_strdup_printf("%s?%d", filename, i); /* we're dealing with subtune, let's ask again tuple information @@ -695,10 +695,9 @@ tuple = dec->get_song_tuple(filename_entry); } else - { filename_entry = g_strdup(filename); - } - + + entry = playlist_entry_new(filename_entry, tuple ? tuple_get_string(tuple, FIELD_TITLE, NULL) : NULL, tuple ? tuple_get_int(tuple, FIELD_LENGTH, NULL) : -1, dec);