changeset 2683:d2ffabee3ced trunk

[svn] Modified playlist_compare_artist so that a leading "the" in an artist's name is ignored during sorting.
author magma
date Tue, 17 Apr 2007 23:36:31 -0700
parents c3cd6e47faf6
children 3e94af4a0f49
files ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c
diffstat 3 files changed, 20 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 16 04:19:03 2007 -0700
+++ b/ChangeLog	Tue Apr 17 23:36:31 2007 -0700
@@ -1,3 +1,13 @@
+2007-04-16 11:19:03 +0000  Giacomo Lozito <james@develia.org>
+  revision [4390]
+  - make the evil 'reload plugins' button behave a bit better
+  trunk/src/audacious/main.c           |   13 +++++++++++++
+  trunk/src/audacious/main.h           |    1 +
+  trunk/src/audacious/pluginenum.c     |    2 ++
+  trunk/src/audacious/ui_preferences.c |    3 +++
+  4 files changed, 19 insertions(+)
+
+
 2007-04-16 03:00:32 +0000  
   revision [4388]
   * Update Japanese translation.
--- a/src/audacious/build_stamp.c	Mon Apr 16 04:19:03 2007 -0700
+++ b/src/audacious/build_stamp.c	Tue Apr 17 23:36:31 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070416-4388";
+const gchar *svn_stamp = "20070416-4390";
--- a/src/audacious/playlist.c	Mon Apr 16 04:19:03 2007 -0700
+++ b/src/audacious/playlist.c	Tue Apr 17 23:36:31 2007 -0700
@@ -2015,10 +2015,17 @@
     if (b->tuple != NULL)
         playlist_entry_get_info(b);
 
-    if (a->tuple != NULL && a->tuple->performer != NULL)
+    if (a->tuple != NULL && a->tuple->performer != NULL) {
         a_artist = a->tuple->performer;
-    if (b->tuple != NULL && b->tuple->performer != NULL)
+        if (str_has_prefix_nocase(a_artist, "the "))
+            a_artist += 4;
+    }
+
+    if (b->tuple != NULL && b->tuple->performer != NULL) {
         b_artist = b->tuple->performer;
+        if (str_has_prefix_nocase(b_artist, "the "))
+            b_artist += 4;
+    }
 
     if (a_artist != NULL && b_artist != NULL)
         return strcasecmp(a_artist, b_artist);