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

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent a51c9d1e6a 3731854ff0
commit e4e9fb1e46
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/eitd/sectionsd.cpp
View File

@@ -92,6 +92,7 @@ static int scanning = 1;
extern bool epg_filter_is_whitelist;
extern bool epg_filter_except_current_next;
static bool xml_epg_filter;
static bool messaging_zap_detected = false;
/*static*/ bool dvb_time_update = false;
@@ -2169,7 +2170,7 @@ bool CEitManager::Start()
config.epg_cache, config.epg_extendedcache, config.epg_max_events, config.epg_old_events);
printf("[sectionsd] NTP: %s, server %s, command %s\n", ntpenable ? "enabled" : "disabled", ntpserver.c_str(), ntp_system_cmd_prefix.c_str());
readEPGFilter();
xml_epg_filter = readEPGFilter();
if (!sectionsd_server.prepare(SECTIONSD_UDS_NAME)) {
fprintf(stderr, "[sectionsd] failed to prepare basic server\n");
@@ -2925,6 +2926,8 @@ unsigned CEitManager::getEventsCount()
void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex);
if (xml_epg_filter)
return;
epg_filter_except_current_next = true;
epg_filter_is_whitelist = true;
addEPGFilter(onid, tsid, sid);
@@ -2933,6 +2936,8 @@ void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_strea
void CEitManager::clearChannelFilters()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex);
if (xml_epg_filter)
return;
clearEPGFilter();
epg_filter_is_whitelist = false;
}