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

rewrite communication system with mpd

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-04-06 19:01:27 +02:00
parent 153e843774
commit 6a3eb73a49
25 changed files with 1039 additions and 1470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/statusbar.cpp
View File

@@ -38,7 +38,7 @@ bool statusbarAllowUnlock = true;
void showMessage(int time, const char *format, va_list list)
{
if (Global::ShowMessages && statusbarAllowUnlock)
if (statusbarAllowUnlock)
{
statusbarLockTime = Global::Timer;
statusbarLockDelay = time;
@@ -122,10 +122,10 @@ void Statusbar::unlock()
else
progressbarBlockUpdate = false;
}
if (!Mpd.isPlaying())
if (MpdStatus.playerState() == MPD::psStop)
{
if (Config.new_design)
Progressbar::draw(Mpd.GetElapsedTime(), Mpd.GetTotalTime());
Progressbar::draw(MpdStatus.elapsedTime(), MpdStatus.totalTime());
else
put() << wclrtoeol;
wFooter->refresh();
@@ -150,12 +150,12 @@ void Statusbar::tryRedraw()
else
progressbarBlockUpdate = !statusbarAllowUnlock;
if (Mpd.GetState() != MPD::psPlay && !statusbarBlockUpdate && !progressbarBlockUpdate)
if (MpdStatus.playerState() != MPD::psStop && !statusbarBlockUpdate && !progressbarBlockUpdate)
{
if (Config.new_design)
Progressbar::draw(Mpd.GetElapsedTime(), Mpd.GetTotalTime());
Progressbar::draw(MpdStatus.elapsedTime(), MpdStatus.totalTime());
else
put() << wclrtoeol;
Status::Changes::elapsedTime();
wFooter->refresh();
}
}
@@ -185,7 +185,7 @@ void Statusbar::msg(int time, const char *format, ...)
void Statusbar::Helpers::mpd()
{
Mpd.OrderDataFetching();
Status::update(Mpd.noidle());
}
bool Statusbar::Helpers::getString(const std::wstring &)