Mercurial > audlegacy
changeset 2614:deb09bfd716b trunk
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
| author | yaz |
|---|---|
| date | Thu, 08 Mar 2007 18:33:20 -0800 |
| parents | 0280eb67fd5d |
| children | 4cc1e231d244 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c |
| diffstat | 3 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 07 16:26:51 2007 -0800 +++ b/ChangeLog Thu Mar 08 18:33:20 2007 -0800 @@ -1,3 +1,10 @@ +2007-03-08 00:26:51 +0000 Giacomo Lozito <james@develia.org> + revision [4236] + - use gdk_get_default_root_window in place of NULL for gdk_window_get_pointer + trunk/src/audacious/ui_fileinfopopup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-03-07 03:04:48 +0000 Kiyoshi Aman <kiyoshi.aman@gmail.com> revision [4234] remove autotools macros that aren't used in audacious core any more
--- a/src/audacious/build_stamp.c Wed Mar 07 16:26:51 2007 -0800 +++ b/src/audacious/build_stamp.c Thu Mar 08 18:33:20 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070307-4234"; +const gchar *svn_stamp = "20070308-4236";
--- a/src/audacious/playlist.c Wed Mar 07 16:26:51 2007 -0800 +++ b/src/audacious/playlist.c Thu Mar 08 18:33:20 2007 -0800 @@ -1926,10 +1926,16 @@ g_return_val_if_fail(a != NULL, 0); g_return_val_if_fail(b != NULL, 0); + if(!a->tuple) + playlist_entry_get_info(a); + if(!b->tuple) + playlist_entry_get_info(b); + g_return_val_if_fail(a->tuple != NULL, 0); g_return_val_if_fail(b->tuple != NULL, 0); - return (a->tuple->track_number - b->tuple->track_number); + return (a->tuple->track_number && b->tuple->track_number ? + a->tuple->track_number - b->tuple->track_number : 0); } static gint @@ -1971,6 +1977,11 @@ g_return_val_if_fail(a != NULL, 0); g_return_val_if_fail(b != NULL, 0); + if(!a->tuple) + playlist_entry_get_info(a); + if(!b->tuple) + playlist_entry_get_info(b); + if (a->tuple != NULL && a->tuple->track_name != NULL) a_title = a->tuple->track_name; if (b->tuple != NULL && b->tuple->track_name != NULL)