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

get rid of global mpd status object

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-04-07 17:28:10 +02:00
parent d451731562
commit 2184fb7c73
11 changed files with 321 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sel_items_adder.cpp
View File

@@ -253,9 +253,9 @@ void SelectedItemsAdder::addAtTheBeginningOfPlaylist() const
void SelectedItemsAdder::addAfterCurrentSong() const
{
if (MpdStatus.playerState() == MPD::psStop)
if (Status::State::player() == MPD::psStop)
return;
size_t pos = MpdStatus.currentSongPosition();
size_t pos = myPlaylist->currentSongPosition();
++pos;
addSongsToPlaylist(m_selected_items, false, pos);
exitSuccessfully();
@@ -263,10 +263,10 @@ void SelectedItemsAdder::addAfterCurrentSong() const
void SelectedItemsAdder::addAfterCurrentAlbum() const
{
if (MpdStatus.playerState() == MPD::psStop)
if (Status::State::player() == MPD::psStop)
return;
auto &pl = myPlaylist->main();
size_t pos = MpdStatus.currentSongPosition();
size_t pos = myPlaylist->currentSongPosition();
withUnfilteredMenu(pl, [&pos, &pl]() {
std::string album = pl[pos].value().getAlbum();
while (pos < pl.size() && pl[pos].value().getAlbum() == album)