Mercurial > audlegacy

comparison src/audacious/playlist.c @ 2614:deb09bfd716b trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 48288757d7c7
children c079e507869a
comparison
equal deleted inserted replaced
2613:0280eb67fd5d 2614:deb09bfd716b
1924 PlaylistEntry * b) 1924 PlaylistEntry * b)
1925 { 1925 {
1926 g_return_val_if_fail(a != NULL, 0); 1926 g_return_val_if_fail(a != NULL, 0);
1927 g_return_val_if_fail(b != NULL, 0); 1927 g_return_val_if_fail(b != NULL, 0);
1928 1928
1929 if(!a->tuple)
1930 playlist_entry_get_info(a);
1931 if(!b->tuple)
1932 playlist_entry_get_info(b);
1933
1929 g_return_val_if_fail(a->tuple != NULL, 0); 1934 g_return_val_if_fail(a->tuple != NULL, 0);
1930 g_return_val_if_fail(b->tuple != NULL, 0); 1935 g_return_val_if_fail(b->tuple != NULL, 0);
1931 1936
1932 return (a->tuple->track_number - b->tuple->track_number); 1937 return (a->tuple->track_number && b->tuple->track_number ?
1938 a->tuple->track_number - b->tuple->track_number : 0);
1933 } 1939 }
1934 1940
1935 static gint 1941 static gint
1936 playlist_compare_playlist(PlaylistEntry * a, 1942 playlist_compare_playlist(PlaylistEntry * a,
1937 PlaylistEntry * b) 1943 PlaylistEntry * b)
1968 { 1974 {
1969 const gchar *a_title = NULL, *b_title = NULL; 1975 const gchar *a_title = NULL, *b_title = NULL;
1970 1976
1971 g_return_val_if_fail(a != NULL, 0); 1977 g_return_val_if_fail(a != NULL, 0);
1972 g_return_val_if_fail(b != NULL, 0); 1978 g_return_val_if_fail(b != NULL, 0);
1979
1980 if(!a->tuple)
1981 playlist_entry_get_info(a);
1982 if(!b->tuple)
1983 playlist_entry_get_info(b);
1973 1984
1974 if (a->tuple != NULL && a->tuple->track_name != NULL) 1985 if (a->tuple != NULL && a->tuple->track_name != NULL)
1975 a_title = a->tuple->track_name; 1986 a_title = a->tuple->track_name;
1976 if (b->tuple != NULL && b->tuple->track_name != NULL) 1987 if (b->tuple != NULL && b->tuple->track_name != NULL)
1977 b_title = b->tuple->track_name; 1988 b_title = b->tuple->track_name;