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

move statusbar/progressbar related code to separate file

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-11 21:52:41 +02:00
parent 6ab2714e2f
commit c90545b008
22 changed files with 577 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ncmpcpp.cpp
View File

@@ -40,6 +40,7 @@
#include "playlist.h"
#include "settings.h"
#include "status.h"
#include "statusbar.h"
#include "visualizer.h"
namespace
@@ -52,7 +53,7 @@ namespace
{
if (signal == SIGPIPE)
{
ShowMessage("SIGPIPE (broken pipe signal) received");
Statusbar::msg("SIGPIPE (broken pipe signal) received");
}
else if (signal == SIGWINCH)
{
@@ -157,9 +158,9 @@ int main(int argc, char **argv)
wFooter = new NC::Window(0, Action::FooterStartY, COLS, Action::FooterHeight, "", Config.statusbar_color, NC::brNone);
wFooter->setTimeout(500);
wFooter->setGetStringHelper(StatusbargetStringHelper);
wFooter->setGetStringHelper(Statusbar::Helpers::getString);
if (Mpd.SupportsIdle())
wFooter->addFDCallback(Mpd.GetFD(), StatusbarMPDCallback);
wFooter->addFDCallback(Mpd.GetFD(), Statusbar::Helpers::mpd);
wFooter->createHistory();
// initialize screens to browser as default previous screen
@@ -207,13 +208,13 @@ int main(int argc, char **argv)
{
if (!wFooter->FDCallbacksListEmpty())
wFooter->clearFDCallbacksList();
ShowMessage("Attempting to reconnect...");
Statusbar::msg("Attempting to reconnect...");
if (Mpd.Connect())
{
ShowMessage("Connected to %s", Mpd.GetHostname().c_str());
Statusbar::msg("Connected to %s", Mpd.GetHostname().c_str());
if (Mpd.SupportsIdle())
{
wFooter->addFDCallback(Mpd.GetFD(), StatusbarMPDCallback);
wFooter->addFDCallback(Mpd.GetFD(), Statusbar::Helpers::mpd);
Mpd.OrderDataFetching(); // we need info about new connection
}
ShowMessages = false;