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

Merge branch 'dvbsi++' into next

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
[CST] Focus
2013-02-28 16:39:34 +04:00
parent cddfcf3bf9 e74f1db278
commit 026592e8fe
70 changed files with 544 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/eitd/xmlutil.cpp
View File

@@ -1,6 +1,6 @@
/*
* (C) 2001 by fnbrd,
* Copyright (C) 2008, 2009 Stefan Seyfried
* Copyright (C) 2008-2009, 2012-2013 Stefan Seyfried
*
* Copyright (C) 2011-2012 CoolStream International Ltd
*
@@ -149,7 +149,7 @@ static void addBlacklist(t_original_network_id onid, t_transport_stream_id tsid,
);
if (!checkBlacklist(channel_id))
{
xprintf("Add Channel Blacklist for channel 0x%012llx, mask 0x%012llx\n", channel_id, mask);
xprintf("Add Channel Blacklist for channel 0x%012" PRIx64 ", mask 0x%012" PRIx64 "\n", channel_id, mask);
ChannelBlacklist *node = new ChannelBlacklist;
node->chan = channel_id;
node->mask = mask;
@@ -168,7 +168,7 @@ static void addNoDVBTimelist(t_original_network_id onid, t_transport_stream_id t
);
if (!checkNoDVBTimelist(channel_id))
{
xprintf("Add channel 0x%012llx, mask 0x%012llx to NoDVBTimelist\n", channel_id, mask);
xprintf("Add channel 0x%012" PRIx64 ", mask 0x%012" PRIx64 " to NoDVBTimelist\n", channel_id, mask);
ChannelNoDVBTimelist *node = new ChannelNoDVBTimelist;
node->chan = channel_id;
node->mask = mask;
@@ -321,6 +321,7 @@ void *insertEventsfromFile(void * data)
uint8_t tid = xmlGetNumericAttribute(event, "tid", 16);
if(tid)
e.table_id = tid;
e.table_id |= 0x80; /* make sure on-air data has a lower table_id */
node = event->xmlChildrenNode;