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

mpd: make functions take item consumer instead of returning vector of items

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-10-01 20:44:22 +02:00
parent 60faa15462
commit 9a292ca20d
14 changed files with 206 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/browser.cpp
View File

@@ -325,16 +325,18 @@ MPD::SongList Browser::getSelectedSongs()
else
# endif // !WIN32
{
auto list = Mpd.GetDirectoryRecursive(item.name);
result.insert(result.end(), list.begin(), list.end());
Mpd.GetDirectoryRecursive(item.name, [&result](MPD::Song &&s) {
result.push_back(s);
});
}
}
else if (item.type == itSong)
result.push_back(*item.song);
else if (item.type == itPlaylist)
{
auto list = Mpd.GetPlaylistContent(item.name);
result.insert(result.end(), list.begin(), list.end());
Mpd.GetPlaylistContent(item.name, [&result](MPD::Song &&s) {
result.push_back(s);
});
}
};
for (auto it = w.begin(); it != w.end(); ++it)
@@ -395,7 +397,9 @@ void Browser::GetDirectory(std::string dir, std::string subdir)
if (isLocal())
GetLocalDirectory(list);
else
list = Mpd.GetDirectory(dir);
Mpd.GetDirectory(dir, [&list](MPD::Item &&item) {
list.push_back(item);
});
# else
list = Mpd.GetDirectory(dir);
# endif // !WIN32