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

enable graphlcd for vu+ only; TODO: needs more fixes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 406a102c2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-12-20 (Sun, 20 Dec 2020)

Origin message was:
------------------
- enable graphlcd for vu+ only; TODO: needs more fixes

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-12-20 23:16:54 +01:00
parent 0f10ea3746
commit a31e02f168
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -700,7 +700,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.osd_colorsettings_advanced_mode = configfile.getBool("osd_colorsettings_advanced_mode", false); g_settings.osd_colorsettings_advanced_mode = configfile.getBool("osd_colorsettings_advanced_mode", false);
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
g_settings.glcd_enable = configfile.getInt32("glcd_enable", 1); g_settings.glcd_enable = configfile.getInt32("glcd_enable", strcmp(g_info.hw_caps->boxvendor, "VU+") == 0);
g_settings.glcd_time_in_standby = configfile.getInt32("glcd_time_in_standby", 1); g_settings.glcd_time_in_standby = configfile.getInt32("glcd_time_in_standby", 1);
g_settings.glcd_standby_weather = configfile.getInt32("glcd_standby_weather", 1); g_settings.glcd_standby_weather = configfile.getInt32("glcd_standby_weather", 1);
@@ -1405,12 +1405,19 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
{ {
configfile.deleteKey("channellist_primetime"); configfile.deleteKey("channellist_primetime");
} }
if (g_settings.version_pseudo < "20170711000000") if (g_settings.version_pseudo < "20200711000000")
{ {
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
configfile.deleteKey("glcd_show_logo"); configfile.deleteKey("glcd_show_logo");
#endif #endif
} }
if (g_settings.version_pseudo < "20201220000000")
{
#ifdef ENABLE_GRAPHLCD
if (strcmp(g_info.hw_caps->boxvendor, "VU+") != 0)
g_settings.glcd_enable = 0;
#endif
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo); configfile.setString("version_pseudo", g_settings.version_pseudo);

2
version_pseudo.h
View File

@@ -1 +1 @@
#define NEUTRINO_VERSION_PSEUDO "20170711000000" #define NEUTRINO_VERSION_PSEUDO "20201220000000"