Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comparators: fix LocaleBasedItemSorting

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-09 14:42:13 +02:00
parent 6f81748602
commit 4961e6d6ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utility/comparators.cpp
View File

@@ -59,10 +59,10 @@ bool LocaleBasedItemSorting::operator()(const MPD::Item &a, const MPD::Item &b)
switch (a.type) switch (a.type)
{ {
case MPD::itDirectory: case MPD::itDirectory:
result = m_cmp(getBasename(a.name), getBasename(b.name)) < 0; result = m_cmp(getBasename(a.name), getBasename(b.name));
break; break;
case MPD::itPlaylist: case MPD::itPlaylist:
result = m_cmp(a.name, b.name) < 0; result = m_cmp(a.name, b.name);
break; break;
case MPD::itSong: case MPD::itSong:
switch (m_sort_mode) switch (m_sort_mode)
@@ -75,7 +75,7 @@ bool LocaleBasedItemSorting::operator()(const MPD::Item &a, const MPD::Item &b)
break; break;
case smCustomFormat: case smCustomFormat:
result = m_cmp(a.song->toString(Config.browser_sort_format), result = m_cmp(a.song->toString(Config.browser_sort_format),
b.song->toString(Config.browser_sort_format)) < 0; b.song->toString(Config.browser_sort_format));
break; break;
} }
break; break;

4
src/utility/comparators.h
View File

@@ -43,7 +43,7 @@ class LocaleBasedSorting
LocaleStringComparison m_cmp; LocaleStringComparison m_cmp;
public: public:
LocaleBasedSorting(const std::locale loc, bool ignore_the) : m_cmp(loc, ignore_the) { } LocaleBasedSorting(const std::locale &loc, bool ignore_the) : m_cmp(loc, ignore_the) { }
bool operator()(const std::string &a, const std::string &b) const { bool operator()(const std::string &a, const std::string &b) const {
return m_cmp(a, b) < 0; return m_cmp(a, b) < 0;
@@ -65,7 +65,7 @@ class LocaleBasedItemSorting
SortMode m_sort_mode; SortMode m_sort_mode;
public: public:
LocaleBasedItemSorting(const std::locale loc, bool ignore_the, SortMode mode) LocaleBasedItemSorting(const std::locale &loc, bool ignore_the, SortMode mode)
: m_cmp(loc, ignore_the), m_sort_mode(mode) { } : m_cmp(loc, ignore_the), m_sort_mode(mode) { }
bool operator()(const MPD::Item &a, const MPD::Item &b) const; bool operator()(const MPD::Item &a, const MPD::Item &b) const;