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

status: store status fields seperately

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-09-12 13:10:47 +02:00
parent 27dc96bece
commit 68a316258c
9 changed files with 274 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/playlist.cpp
View File

@@ -249,9 +249,9 @@ MPD::SongList Playlist::getSelectedSongs()
MPD::Song Playlist::nowPlayingSong()
{
MPD::Song s;
if (Status::get().playerState() != MPD::psStop)
if (Status::State::player() != MPD::psStop)
withUnfilteredMenu(w, [this, &s]() {
s = w.at(Status::get().currentSongPosition()).value();
s = w.at(Status::State::currentSongPosition()).value();
});
return s;
}
@@ -298,7 +298,7 @@ std::string Playlist::getTotalLength()
if (Config.playlist_show_remaining_time && m_reload_remaining && !w.isFiltered())
{
m_remaining_time = 0;
for (size_t i = Status::get().currentSongPosition(); i < w.size(); ++i)
for (size_t i = Status::State::currentSongPosition(); i < w.size(); ++i)
m_remaining_time += w[i].value().getDuration();
m_reload_remaining = false;
}