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

mpd: use lambda closures instead of passing vectors to functions

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-08-28 06:01:56 +02:00
parent 4a0026052f
commit a20a195225
14 changed files with 178 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/browser.cpp
View File

@@ -290,7 +290,11 @@ void Browser::GetSelectedSongs(MPD::SongList &v)
}
else
# endif // !WIN32
Mpd.GetDirectoryRecursive(locale_to_utf_cpy(item.name), v);
{
Mpd.GetDirectoryRecursive(locale_to_utf_cpy(item.name), [&v](MPD::Song &&s) {
v.push_back(s);
});
}
break;
}
case itSong:
@@ -300,7 +304,9 @@ void Browser::GetSelectedSongs(MPD::SongList &v)
}
case itPlaylist:
{
Mpd.GetPlaylistContent(locale_to_utf_cpy(item.name), v);
Mpd.GetPlaylistContent(locale_to_utf_cpy(item.name), [&v](MPD::Song &&s) {
v.push_back(s);
});
break;
}
}
@@ -370,9 +376,18 @@ void Browser::GetDirectory(std::string dir, std::string subdir)
MPD::ItemList list;
# ifndef WIN32
isLocal() ? GetLocalDirectory(list) : Mpd.GetDirectory(dir, list);
if (isLocal())
GetLocalDirectory(list);
else
{
Mpd.GetDirectory(dir, [&list](MPD::Item &&i) {
list.push_back(i);
});
}
# else
Mpd.GetDirectory(dir, list);
Mpd.GetDirectory(dir, [&list](MPD::Item &&i) {
list.push_back(i);
});
# endif // !WIN32
if (!isLocal()) // local directory is already sorted
std::sort(list.begin(), list.end(), CaseInsensitiveSorting());