mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- glcd: fix display of weather w/o time in standby mode

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-06-28 21:18:08 +02:00
committed by Thilo Graf
parent d0434ed495
commit 8a7d19504e
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/driver/glcd/glcd.cpp
View File

@@ -88,6 +88,7 @@ cGLCD::cGLCD()
doRescan = false; doRescan = false;
doStandby = false; doStandby = false;
doStandbyTime = false; doStandbyTime = false;
doStandbyWeather = false;
doShowVolume = false; doShowVolume = false;
doShowLcdIcon = false; doShowLcdIcon = false;
doSuspend = false; doSuspend = false;
@@ -224,7 +225,7 @@ void cGLCD::Exec()
return; return;
} }
if (doStandbyTime) if (doStandbyTime || doStandbyWeather)
{ {
if (g_settings.glcd_time_in_standby == CLOCK_ANALOG) if (g_settings.glcd_time_in_standby == CLOCK_ANALOG)
{ {
@@ -823,7 +824,7 @@ void cGLCD::Run(void)
while ((!doSuspend && !doStandby) && !doExit && g_settings.glcd_enable) while ((!doSuspend && !doStandby) && !doExit && g_settings.glcd_enable)
{ {
if (doMirrorOSD && !doStandbyTime) if (doMirrorOSD && !doStandbyTime && !doStandbyWeather)
{ {
if (blitFlag) if (blitFlag)
{ {
@@ -857,7 +858,7 @@ void cGLCD::Run(void)
continue; continue;
} }
if (g_settings.glcd_mirror_video && !doStandbyTime) if (g_settings.glcd_mirror_video && !doStandbyTime && !doStandbyWeather)
{ {
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
lcd->SetMirrorVideo(true); lcd->SetMirrorVideo(true);
@@ -1135,19 +1136,30 @@ void cGLCD::StandbyMode(bool b)
{ {
if (cglcd) if (cglcd)
{ {
if (g_settings.glcd_time_in_standby) if (g_settings.glcd_time_in_standby || g_settings.glcd_standby_weather)
{ {
if (g_settings.glcd_time_in_standby)
cglcd->doStandbyTime = b; cglcd->doStandbyTime = b;
cglcd->doStandby = false; else
} else {
cglcd->doStandbyTime = false; cglcd->doStandbyTime = false;
cglcd->doStandby = b;
if (g_settings.glcd_standby_weather)
cglcd->doStandbyWeather = b;
else
cglcd->doStandbyWeather = false;
cglcd->doStandby = false;
} }
else
cglcd->doStandby = b;
if (b) if (b)
{ {
cglcd->doScrollChannel = false; cglcd->doScrollChannel = false;
cglcd->doScrollEpg = false; cglcd->doScrollEpg = false;
} else { }
else
{
cglcd->doScrollChannel = true; cglcd->doScrollChannel = true;
cglcd->doScrollEpg = true; cglcd->doScrollEpg = true;
} }
@@ -1669,10 +1681,10 @@ void cGLCD::UpdateBrightness()
if (cglcd && cglcd->lcd) if (cglcd && cglcd->lcd)
{ {
if (timeouted && !cglcd->doStandbyTime) if (timeouted && !cglcd->doStandbyTime && !cglcd->doStandbyWeather)
cglcd->lcd->SetBrightness((unsigned int) (dim_brightness)); cglcd->lcd->SetBrightness((unsigned int) (dim_brightness));
else else
cglcd->lcd->SetBrightness((unsigned int) (cglcd->doStandbyTime ? g_settings.glcd_brightness_standby : g_settings.glcd_brightness)); cglcd->lcd->SetBrightness((unsigned int) ((cglcd->doStandbyTime || cglcd->doStandbyWeather) ? g_settings.glcd_brightness_standby : g_settings.glcd_brightness));
} }
} }

1
src/driver/glcd/glcd.h
View File

@@ -116,6 +116,7 @@ class cGLCD
bool doSuspend; bool doSuspend;
bool doStandby; bool doStandby;
bool doStandbyTime; bool doStandbyTime;
bool doStandbyWeather;
bool doExit; bool doExit;
bool doScrollChannel; bool doScrollChannel;
bool doScrollEpg; bool doScrollEpg;