Ticket #1287: 5-musiccompare.patch

mythmusic/mythmusic/metadata.cpp

@@ -123 +129 @@
 {
     if (format == "cast") 
     {
-        int artist_cmp = qstrcmp (Artist(), other->Artist());
-        int title_cmp = qstrcmp (Title(), other->Title());
+        int artist_cmp = Artist().lower().localeAwareCompare(other->Artist().lower());
         
         if (artist_cmp == 0) 
-            return title_cmp;
+            return Title().lower().localeAwareCompare(other->Title().lower());
         
         return artist_cmp;
     } 
@@ -1546 +1585 @@
     QString title2 = itemB->getTitle().lower();
     
     // Cut "the " off the front of titles
-    title1 = (title1.lower().left(4) == thePrefix) ? title1.mid(4) : title1;
-    title2 = (title2.lower().left(4) == thePrefix) ? title2.mid(4) : title2;
+    if (title1.left(4) == thePrefix) 
+        title1 = title1.mid(4);
+    if (title2.left(4) == thePrefix) 
+        title2 = title2.mid(4);
 
-    return qstrcmp(title1, title2);
+    return title1.localeAwareCompare(title2);
 }