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

scanepg: rename webtv => webchan

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3946379f41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- scanepg: rename webtv => webchan

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 09:36:19 +01:00
committed by Thilo Graf
parent 34e83914e4
commit 13319437b7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/scanepg.cpp
View File

@@ -207,11 +207,11 @@ void CEpgScan::AddTransponders()
bool CEpgScan::CheckMode() bool CEpgScan::CheckMode()
{ {
bool webtv = IS_WEBCHAN(CZapit::getInstance()->GetCurrentChannelID()); bool webchan = IS_WEBCHAN(CZapit::getInstance()->GetCurrentChannelID());
if ((g_settings.epg_scan_mode == CEpgScan::MODE_OFF) if ((g_settings.epg_scan_mode == CEpgScan::MODE_OFF)
|| (standby && !(g_settings.epg_scan_mode & MODE_STANDBY)) || (standby && !(g_settings.epg_scan_mode & MODE_STANDBY))
|| (!standby && !(g_settings.epg_scan_mode & MODE_LIVE)) || (!standby && !(g_settings.epg_scan_mode & MODE_LIVE))
|| (!standby && !webtv && (CFEManager::getInstance()->getEnabledCount() <= 1))) { || (!standby && !webchan && (CFEManager::getInstance()->getEnabledCount() <= 1))) {
return false; return false;
} }
return true; return true;
@@ -368,8 +368,8 @@ void CEpgScan::Next()
CFrontend *pip_fe = NULL; CFrontend *pip_fe = NULL;
#endif #endif
if (!standby) { if (!standby) {
bool webtv = IS_WEBCHAN(CZapit::getInstance()->GetCurrentChannelID()); bool webchan = IS_WEBCHAN(CZapit::getInstance()->GetCurrentChannelID());
if (!webtv) { if (!webchan) {
llocked = true; llocked = true;
live_fe = CZapit::getInstance()->GetLiveFrontend(); live_fe = CZapit::getInstance()->GetLiveFrontend();
CFEManager::getInstance()->lockFrontend(live_fe); CFEManager::getInstance()->lockFrontend(live_fe);