mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

infoviewer: simplify clock handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08daae7852
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-27 (Fri, 27 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-03-27 13:27:22 +01:00
committed by vanhofen
parent c7e089c9ac
commit 2e4580b3fc
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/infoviewer.cpp
View File

@@ -4,6 +4,9 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Bugfixes/cleanups (C) 2007-2013,2015 Stefan Seyfried
(C) 2008 Novell, Inc. Author: Stefan Seyfried
Kommentar: Kommentar:
Diese GUI wurde von Grund auf neu programmiert und sollte nun vom Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
@@ -254,18 +257,8 @@ void CInfoViewer::initClock()
clock->setPos(BoxEndX - 10 - clock->getWidth(), ChanNameY); clock->setPos(BoxEndX - 10 - clock->getWidth(), ChanNameY);
clock->setTextColor(COL_INFOBAR_TEXT); clock->setTextColor(COL_INFOBAR_TEXT);
} clock->setClockFormat("%H:%M");
clock->setClockBlink("%H %M");
void CInfoViewer::paintTime (bool show_dot)
{
if (!gotTime)
gotTime = timeset;
if (!gotTime)
return;
clock->setClockFormat(show_dot ? "%H:%M" : "%H %M");
clock->paint(CC_SAVE_SCREEN_NO);
} }
void CInfoViewer::showRecordIcon (const bool show) void CInfoViewer::showRecordIcon (const bool show)
@@ -512,7 +505,8 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
paintBackground(COL_INFOBAR_PLUS_0); paintBackground(COL_INFOBAR_PLUS_0);
bool show_dot = true; bool show_dot = true;
paintTime (show_dot); if (timeset)
clock->paint(CC_SAVE_SCREEN_NO);
showRecordIcon (show_dot); showRecordIcon (show_dot);
show_dot = !show_dot; show_dot = !show_dot;
@@ -693,7 +687,8 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
paintBackground(col_NumBox); paintBackground(col_NumBox);
bool show_dot = true; bool show_dot = true;
paintTime (show_dot); if (timeset)
clock->paint(CC_SAVE_SCREEN_NO);
showRecordIcon (show_dot); showRecordIcon (show_dot);
show_dot = !show_dot; show_dot = !show_dot;
@@ -900,7 +895,8 @@ void CInfoViewer::loop(bool show_dot)
res = messages_return::cancel_info; res = messages_return::cancel_info;
} else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == sec_timer_id)) { } else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == sec_timer_id)) {
showSNR (); showSNR ();
paintTime (show_dot); if (timeset)
clock->paint(CC_SAVE_SCREEN_NO);
showRecordIcon (show_dot); showRecordIcon (show_dot);
show_dot = !show_dot; show_dot = !show_dot;
showInfoFile(); showInfoFile();

1
src/gui/infoviewer.h
View File

@@ -115,7 +115,6 @@ class CInfoViewer
const char *nextStart = NULL, const char *nextDuration = NULL, const char *nextStart = NULL, const char *nextDuration = NULL,
bool update_current = true, bool update_next = true); bool update_current = true, bool update_next = true);
void initClock(); void initClock();
void paintTime( bool show_dot );
void showRecordIcon(const bool show); void showRecordIcon(const bool show);
void showIcon_Tuner() const; void showIcon_Tuner() const;