From 526e04b8b4d8ba43f39c0bb653200b054bf5dbd9 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 13 Feb 2012 20:02:54 +0000
Subject: added 'disc number' tag support for flac files with embedded
 cuesheet, added sorting by disc number (Brice Videau)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2601 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmpui/playlistmodel.cpp | 15 +++++++++++++++
 src/qmmpui/playlistmodel.h   |  1 +
 2 files changed, 16 insertions(+)

(limited to 'src/qmmpui')

diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 50ffe35b1..bbdb64a14 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -639,6 +639,17 @@ static bool _titleGreaterComparator(PlayListItem* s1,PlayListItem* s2)
 {
     return QString::localeAwareCompare (s1->value(Qmmp::TITLE), s2->value(Qmmp::TITLE)) > 0;
 }
+
+//by album+disc
+static bool _discnumberLessComparator(PlayListItem* s1,PlayListItem* s2)
+{
+    return QString::localeAwareCompare (s1->value(Qmmp::DISCNUMBER), s2->value(Qmmp::DISCNUMBER)) < 0;
+}
+
+static bool _discnumberGreaterComparator(PlayListItem* s1,PlayListItem* s2)
+{
+    return QString::localeAwareCompare (s1->value(Qmmp::DISCNUMBER), s2->value(Qmmp::DISCNUMBER)) > 0;
+}
 //by album
 static bool _albumLessComparator(PlayListItem* s1,PlayListItem* s2)
 {
@@ -722,6 +733,10 @@ void PlayListModel::doSort(int sort_mode,QList<PlayListItem*>& list_to_sort)
         compareLessFunc = _titleLessComparator;
         compareGreaterFunc = _titleGreaterComparator;
         break;
+    case DISCNUMBER:
+        compareLessFunc = _discnumberLessComparator;
+        compareGreaterFunc = _discnumberGreaterComparator;
+        break;
     case ALBUM:
         compareLessFunc = _albumLessComparator;
         compareGreaterFunc = _albumGreaterComparator;
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 170425b3e..9663ea478 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -282,6 +282,7 @@ public:
     {
         TITLE,             /*!< by title */
         ALBUM,             /*!< by album */
+        DISCNUMBER,        /*!< by discnumber */
         ARTIST,            /*!< by artist */
         FILENAME,          /*!< by file name */
         PATH_AND_FILENAME, /*!< by path and file name */
-- 
cgit v1.2.3-13-gbd6f