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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e90d38653
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-28 (Sun, 28 Jun 2020)

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

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-28 21:18:08 +02:00
parent 62d566d047
commit 839c4f42aa
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,7 @@ cGLCD::cGLCD()
doRescan = false;
doStandby = false;
doStandbyTime = false;
doStandbyWeather = false;
doShowVolume = false;
doShowLcdIcon = false;
doSuspend = false;
@@ -224,7 +225,7 @@ void cGLCD::Exec()
return;
}
if (doStandbyTime)
if (doStandbyTime || doStandbyWeather)
{
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)
{
if (doMirrorOSD && !doStandbyTime)
if (doMirrorOSD && !doStandbyTime && !doStandbyWeather)
{
if (blitFlag)
{
@@ -857,7 +858,7 @@ void cGLCD::Run(void)
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
lcd->SetMirrorVideo(true);
@@ -1135,19 +1136,30 @@ void cGLCD::StandbyMode(bool b)
{
if (cglcd)
{
if (g_settings.glcd_time_in_standby)
if (g_settings.glcd_time_in_standby || g_settings.glcd_standby_weather)
{
cglcd->doStandbyTime = b;
if (g_settings.glcd_time_in_standby)
cglcd->doStandbyTime = b;
else
cglcd->doStandbyTime = false;
if (g_settings.glcd_standby_weather)
cglcd->doStandbyWeather = b;
else
cglcd->doStandbyWeather = false;
cglcd->doStandby = false;
} else {
cglcd->doStandbyTime = false;
cglcd->doStandby = b;
}
else
cglcd->doStandby = b;
if (b)
{
cglcd->doScrollChannel = false;
cglcd->doScrollEpg = false;
} else {
}
else
{
cglcd->doScrollChannel = true;
cglcd->doScrollEpg = true;
}
@@ -1669,10 +1681,10 @@ void cGLCD::UpdateBrightness()
if (cglcd && cglcd->lcd)
{
if (timeouted && !cglcd->doStandbyTime)
if (timeouted && !cglcd->doStandbyTime && !cglcd->doStandbyWeather)
cglcd->lcd->SetBrightness((unsigned int) (dim_brightness));
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));
}
}