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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)
This commit is contained in:
vanhofen
2017-05-23 17:59:21 +02:00
parent 497db594c1 b7e59b8b62
commit 59852c47dd
23 changed files with 121 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/neutrino.cpp
View File

@@ -1165,6 +1165,12 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
configfile.deleteKey("screen_width");
configfile.deleteKey("screen_height");
}
//NI
if (g_settings.version_pseudo < "20170516150000")
{
if (g_settings.movieplayer_bisection_jump == 1)
g_settings.movieplayer_bisection_jump = 5;
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo);
@@ -4145,9 +4151,11 @@ void CNeutrinoApp::saveEpg(bool cvfd_mode)
}
printf("[neutrino] Saving EPG to %s...\n", g_settings.epg_dir.c_str());
CVFD::getInstance()->Clear();
//NI CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING));
if(!cvfd_mode){
CVFD::getInstance()->Clear();
//NI CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING));
}
g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str());