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

media library: fix marking songs as in playlist

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-10-18 16:15:53 +02:00
parent 33fb33dc8d
commit 3b61a0c1ab
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/media_library.cpp
View File

@@ -65,6 +65,8 @@ bool AlbumEntryMatcher(const Regex &rx, const NC::Menu<AlbumEntry>::Item &item,
bool SongEntryMatcher(const Regex &rx, const MPD::Song &s); bool SongEntryMatcher(const Regex &rx, const MPD::Song &s);
struct SortSongs { struct SortSongs {
typedef NC::Menu<MPD::Song>::Item SongItem;
static const std::array<MPD::Song::GetFunction, 3> GetFuns; static const std::array<MPD::Song::GetFunction, 3> GetFuns;
LocaleStringComparison m_cmp; LocaleStringComparison m_cmp;
@@ -74,6 +76,9 @@ public:
SortSongs(bool disc_only) SortSongs(bool disc_only)
: m_cmp(std::locale(), Config.ignore_leading_the), m_offset(disc_only ? 2 : 0) { } : m_cmp(std::locale(), Config.ignore_leading_the), m_offset(disc_only ? 2 : 0) { }
bool operator()(const SongItem &a, const SongItem &b) {
return (*this)(a.value(), b.value());
}
bool operator()(const MPD::Song &a, const MPD::Song &b) { bool operator()(const MPD::Song &a, const MPD::Song &b) {
for (auto get = GetFuns.begin()+m_offset; get != GetFuns.end(); ++get) { for (auto get = GetFuns.begin()+m_offset; get != GetFuns.end(); ++get) {
int ret = m_cmp(a.getTags(*get, Config.tags_separator), int ret = m_cmp(a.getTags(*get, Config.tags_separator),
@@ -397,7 +402,7 @@ void MediaLibrary::update()
}); });
if (idx < Songs.size()) if (idx < Songs.size())
Songs.resizeList(idx); Songs.resizeList(idx);
std::sort(Songs.beginV(), Songs.endV(), SortSongs(!album.isAllTracksEntry())); std::sort(Songs.begin(), Songs.end(), SortSongs(!album.isAllTracksEntry()));
}); });
Songs.refresh(); Songs.refresh();
} }