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

pass ProxySongList around since it already has shared_ptr inside

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-16 07:13:54 +02:00
parent ddd18681ba
commit 48cf01f084
19 changed files with 83 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/search_engine.cpp
View File

@@ -129,7 +129,7 @@ void SearchEngine::switchTo()
SwitchTo::execute(this);
if (w.empty())
Prepare();
markSongsInPlaylist(getProxySongList());
markSongsInPlaylist(proxySongList());
drawHeader();
}
@@ -184,7 +184,7 @@ void SearchEngine::enterPressed()
w.insertItem(ResetButton+2, SEItem(), 1, 1);
w.at(ResetButton+2).value().mkBuffer() << Config.color1 << "Search results: " << Config.color2 << "Found " << found << (found > 1 ? " songs" : " song") << NC::clDefault;
w.insertSeparator(ResetButton+3);
markSongsInPlaylist(getProxySongList());
markSongsInPlaylist(proxySongList());
Statusbar::msg("Searching finished");
if (Config.block_search_constraints_change)
for (size_t i = 0; i < StaticOptions-4; ++i)
@@ -296,9 +296,9 @@ void SearchEngine::prevFound(bool wrap)
/***********************************************************************/
std::shared_ptr< ProxySongList > SearchEngine::getProxySongList()
ProxySongList SearchEngine::proxySongList()
{
return mkProxySongList(w, [](NC::Menu<SEItem>::Item &item) -> MPD::Song * {
return ProxySongList(w, [](NC::Menu<SEItem>::Item &item) -> MPD::Song * {
MPD::Song *ptr = 0;
if (!item.isSeparator() && item.value().isSong())
ptr = &item.value().song();