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

10
src/browser.cpp
View File

@@ -127,7 +127,7 @@ void Browser::enterPressed()
if (w.empty())
return;
const MPD::Item &item = w.current().value();
const MPD::Item &item = w.current()->value();
switch (item.type())
{
case MPD::Item::Type::Directory:
@@ -170,7 +170,7 @@ void Browser::spacePressed()
return;
}
const MPD::Item &item = w.current().value();
const MPD::Item &item = w.current()->value();
// ignore parent directory
if (isParentDirectory(item))
return;
@@ -212,12 +212,12 @@ void Browser::mouseButtonPressed(MEVENT me)
if (me.bstate & (BUTTON1_PRESSED | BUTTON3_PRESSED))
{
w.Goto(me.y);
switch (w.current().value().type())
switch (w.current()->value().type())
{
case MPD::Item::Type::Directory:
if (me.bstate & BUTTON1_PRESSED)
{
getDirectory(w.current().value().directory().path());
getDirectory(w.current()->value().directory().path());
drawHeader();
}
else
@@ -369,7 +369,7 @@ std::vector<MPD::Song> Browser::getSelectedSongs()
item_handler(item.value());
// if no item is selected, add current one
if (songs.empty() && !w.empty())
item_handler(w.current().value());
item_handler(w.current()->value());
return songs;
}