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

menu: make current() return an iterator

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-04 22:33:16 +01:00
parent 12772c47f9
commit efdac2058e
13 changed files with 103 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/playlist.cpp
View File

@@ -119,14 +119,14 @@ void Playlist::update()
void Playlist::enterPressed()
{
if (!w.empty())
Mpd.PlayID(w.current().value().getID());
Mpd.PlayID(w.current()->value().getID());
}
void Playlist::spacePressed()
{
if (!w.empty())
{
w.current().setSelected(!w.current().isSelected());
w.current()->setSelected(!w.current()->isSelected());
w.scroll(NC::Scroll::Down);
}
}
@@ -235,7 +235,7 @@ std::vector<MPD::Song> Playlist::getSelectedSongs()
if (it->isSelected())
result.push_back(it->value());
if (result.empty() && !w.empty())
result.push_back(w.current().value());
result.push_back(w.current()->value());
return result;
}
@@ -327,7 +327,7 @@ std::string Playlist::getTotalLength()
void Playlist::SetSelectedItemsPriority(int prio)
{
auto list = getSelectedOrCurrent(w.begin(), w.end(), w.currentI());
auto list = getSelectedOrCurrent(w.begin(), w.end(), w.current());
Mpd.StartCommandsList();
for (auto it = list.begin(); it != list.end(); ++it)
Mpd.SetPriority((*it)->value(), prio);