Ticket #9603: playbackbox-sort_description.diff

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -120 +120 @@
                 b->GetScheduledStartTime().date() ? 1 : -1);
 }
 
+static int comp_description(const ProgramInfo *a, const ProgramInfo *b)
+{
+    if (a->GetDescription() == b->GetDescription())
+        return (a->GetRecordingStartTime() <
+                b->GetRecordingStartTime() ? 1 : -1);
+    else
+        return (a->GetDescription() < b->GetDescription() ? 1 : -1);
+}
+
+static int comp_description_rev(const ProgramInfo *a, const ProgramInfo *b)
+{
+    if (a->GetDescription() == b->GetDescription())
+        return (a->GetRecordingStartTime() >
+                b->GetRecordingStartTime() ? 1 : -1);
+    else
+        return (a->GetDescription() > b->GetDescription() ? 1 : -1);
+}
+
 static bool comp_programid_less_than(
     const ProgramInfo *a, const ProgramInfo *b)
 {
@@ -162 +180 @@
     return comp_recordDate_rev(a, b) < 0;
 }
 
+static bool comp_description_less_than(
+    const ProgramInfo *a, const ProgramInfo *b)
+{
+    return comp_description(a, b) < 0;
+}
+
+static bool comp_description_rev_less_than(
+    const ProgramInfo *a, const ProgramInfo *b)
+{
+    return comp_description_rev(a, b) < 0;
+}
+
 static const ArtworkType s_artType[] =
     { kArtworkFan,        kArtworkBanner,        kArtworkCover, };
 static const uint s_artDelay[] =
@@ -1722 +1752 @@
             }
         }
     }
+    else if (episodeSort == "Description")
+    {
+        QMap<QString, ProgramList>::Iterator Iprog;
+        for (Iprog = m_progLists.begin(); Iprog != m_progLists.end(); ++Iprog)
+        {
+            if (!Iprog.key().isEmpty())
+            {
+                std::stable_sort((*Iprog).begin(), (*Iprog).end(),
+                                 (m_listOrder == 0 || m_type == kDeleteBox) ?
+                                 comp_description_rev_less_than :
+                                 comp_description_less_than);
+            }
+        }
+    }
 
     if (!m_progLists[m_watchGroupLabel].empty())
     {