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

media library: fix compatibility with mpd < 0.14

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-05-29 21:02:16 +02:00
parent d1b82557d2
commit ec9017d5a2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/media_library.cpp
View File

@@ -184,6 +184,7 @@ void MediaLibrary::Update()
{ {
MPD::TagList list; MPD::TagList list;
Albums->Clear(); Albums->Clear();
Songs->Clear();
Mpd.GetList(list, Config.media_lib_primary_tag); Mpd.GetList(list, Config.media_lib_primary_tag);
sort(list.begin(), list.end(), CaseInsensitiveSorting()); sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (MPD::TagList::iterator it = list.begin(); it != list.end(); ++it) for (MPD::TagList::iterator it = list.begin(); it != list.end(); ++it)
@@ -198,9 +199,8 @@ void MediaLibrary::Update()
Artists->Refresh(); Artists->Refresh();
} }
if (!hasTwoColumns && !Artists->Empty() && Albums->Empty()) if (!hasTwoColumns && !Artists->Empty() && Albums->Empty() && Songs->Empty())
{ {
Songs->Clear();
Albums->Reset(); Albums->Reset();
MPD::TagList list; MPD::TagList list;
locale_to_utf(Artists->Current()); locale_to_utf(Artists->Current());
@@ -324,7 +324,8 @@ void MediaLibrary::Update()
} }
Mpd.CommitSearch(list); Mpd.CommitSearch(list);
sort(list.begin(), list.end(), Albums->Current().Year == AllTracksMarker ? SortAllTracks : SortSongsByTrack); if (!Albums->Empty()) // for compatibility with mpd < 0.14
sort(list.begin(), list.end(), Albums->Current().Year == AllTracksMarker ? SortAllTracks : SortSongsByTrack);
bool bold = 0; bool bold = 0;
for (MPD::SongList::const_iterator it = list.begin(); it != list.end(); ++it) for (MPD::SongList::const_iterator it = list.begin(); it != list.end(); ++it)
@@ -354,6 +355,7 @@ void MediaLibrary::SpacePressed()
{ {
Artists->Select(Artists->Choice(), !Artists->isSelected()); Artists->Select(Artists->Choice(), !Artists->isSelected());
Albums->Clear(); Albums->Clear();
Songs->Clear();
} }
else if (w == Albums) else if (w == Albums)
{ {
@@ -629,6 +631,7 @@ void MediaLibrary::LocateSong(const MPD::Song &s)
{ {
Artists->Highlight(i); Artists->Highlight(i);
Albums->Clear(); Albums->Clear();
Songs->Clear();
break; break;
} }
} }

1
src/ncmpcpp.cpp
View File

@@ -2115,6 +2115,7 @@ int main(int argc, char *argv[])
if (myScreen->ActiveWindow() == myLibrary->Artists) if (myScreen->ActiveWindow() == myLibrary->Artists)
{ {
myLibrary->Albums->Clear(); myLibrary->Albums->Clear();
myLibrary->Songs->Clear();
} }
else if (myScreen->ActiveWindow() == myLibrary->Albums) else if (myScreen->ActiveWindow() == myLibrary->Albums)
{ {