mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd: ignore neutrino epg filter, if filter was configured from xml

Browse Source
This commit is contained in:
[CST] Focus
2015-02-15 12:57:29 +03:00
parent 721cb9bd74
commit 5d9e7a814d
3 changed files with 9 additions and 3 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_is_whitelist;
extern bool epg_filter_except_current_next; extern bool epg_filter_except_current_next;
static bool xml_epg_filter;
static bool messaging_zap_detected = false; static bool messaging_zap_detected = false;
/*static*/ bool dvb_time_update = false; /*static*/ bool dvb_time_update = false;
@@ -2153,7 +2154,7 @@ bool CEitManager::Start()
config.epg_cache, config.epg_extendedcache, config.epg_max_events, config.epg_old_events); 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()); 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)) { if (!sectionsd_server.prepare(SECTIONSD_UDS_NAME)) {
fprintf(stderr, "[sectionsd] failed to prepare basic server\n"); fprintf(stderr, "[sectionsd] failed to prepare basic server\n");
@@ -2904,6 +2905,8 @@ unsigned CEitManager::getEventsCount()
void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid) void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex);
if (xml_epg_filter)
return;
epg_filter_except_current_next = true; epg_filter_except_current_next = true;
epg_filter_is_whitelist = true; epg_filter_is_whitelist = true;
addEPGFilter(onid, tsid, sid); addEPGFilter(onid, tsid, sid);
@@ -2912,6 +2915,8 @@ void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_strea
void CEitManager::clearChannelFilters() void CEitManager::clearChannelFilters()
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> slock(filter_mutex);
if (xml_epg_filter)
return;
clearEPGFilter(); clearEPGFilter();
epg_filter_is_whitelist = false; epg_filter_is_whitelist = false;
} }

3
src/eitd/xmlutil.cpp
View File

@@ -190,7 +190,7 @@ static void addNoDVBTimelist(t_original_network_id onid, t_transport_stream_id t
} }
} }
void readEPGFilter(void) bool readEPGFilter(void)
{ {
xmlDocPtr filter_parser = parseXmlFile(epg_filter_dir.c_str()); xmlDocPtr filter_parser = parseXmlFile(epg_filter_dir.c_str());
@@ -223,6 +223,7 @@ void readEPGFilter(void)
} }
} }
xmlFreeDoc(filter_parser); xmlFreeDoc(filter_parser);
return (CurrentEPGFilter != NULL);
} }
void readDVBTimeFilter(void) void readDVBTimeFilter(void)

2
src/eitd/xmlutil.h
View File

@@ -37,7 +37,7 @@
void *insertEventsfromFile(void * data); void *insertEventsfromFile(void * data);
void writeEventsToFile(char *epgdir); void writeEventsToFile(char *epgdir);
void readEPGFilter(void); bool readEPGFilter(void);
void readDVBTimeFilter(void); void readDVBTimeFilter(void);
bool checkEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid); bool checkEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid);
bool checkBlacklist(t_channel_id channel_id); bool checkBlacklist(t_channel_id channel_id);