Ticket #537: sort_patch.txt

Index: mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
--- mythtv/programs/mythfrontend/playbackbox.cpp        (revision 7442)
+++ mythtv/programs/mythfrontend/playbackbox.cpp        (working copy)
@@ -53,7 +53,7 @@
         return 1;
 }
 
-static int comp_originalAirDate(ProgramInfo *a, ProgramInfo *b)
+static int comp_originalAirDateDesc(ProgramInfo *a, ProgramInfo *b)
 {
     QDate dt1, dt2;
 
@@ -82,6 +82,35 @@
         return 1;
 }
 
+static int comp_originalAirDateAsc(ProgramInfo *a, ProgramInfo *b)
+{
+    QDate dt1, dt2;
+
+    if (a->hasAirDate)
+        dt1 = a->originalAirDate;
+    else
+        dt1 = a->startts.date();
+
+    if (b->hasAirDate)
+        dt2 = b->originalAirDate;
+    else
+        dt2 = b->startts.date();
+
+    if (dt1 == dt2)
+    {
+        if (a->recstartts == b->recstartts)
+            return 0;
+        if (a->recstartts < b->recstartts)
+            return 1;
+        else
+            return -1;
+    }
+    if (dt1 < dt2)
+        return 1;
+    else
+        return -1;
+}
+
 PlaybackBox::PlaybackBox(BoxType ltype, MythMainWindow *parent, 
                          const char *name)
            : MythDialog(parent, name)
@@ -1411,7 +1440,12 @@
         for (Iprog = progLists.begin(); Iprog != progLists.end(); ++Iprog)
         {
             if (!Iprog.key().isEmpty())
-                Iprog.data().Sort(comp_originalAirDate);
+            {
+                if (listOrder == 1)
+                    Iprog.data().Sort(comp_originalAirDateAsc);
+                else
+                    Iprog.data().Sort(comp_originalAirDateDesc);
+            }
         }
     }
     else if (episodeSort == "Id")