frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler warning with Clang 3.4.1

Browse Source
This commit is contained in:
Klaus Schmidinger 2014-02-08 14:21:47 +01:00
parent e5fde77e56
commit a30563634d
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -3261,3 +3261,7 @@ Christian Paulick <cpaulick@xeatre.tv>
Mariusz Bialonczyk <manio@skyboo.net> Mariusz Bialonczyk <manio@skyboo.net>
for reporting a problem with live streaming of encrypted channels, when there are no for reporting a problem with live streaming of encrypted channels, when there are no
CA descriptors, yet, on initial tuning CA descriptors, yet, on initial tuning
Tony Houghton <h@realh.co.uk>
for suggesting to add LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler
warning with Clang 3.4.1

2
HISTORY
View File

@ -8192,3 +8192,5 @@ Video Disk Recorder Revision History
Users of stable releases shouldn't notice any problems. Users of stable releases shouldn't notice any problems.
- Fixed a possible crash in the OSD demo (reported by Christopher Reimer). - Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
- Fixed some compiler warnings with Clang 3.4.1 (reported by Paul Menzel). - Fixed some compiler warnings with Clang 3.4.1 (reported by Paul Menzel).
- Added LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler warning with
Clang 3.4.1 (suggested by Tony Houghten).

4
eit.c
View File

@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>. * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
* *
* $Id: eit.c 3.4 2014/02/08 12:33:01 kls Exp $ * $Id: eit.c 3.5 2014/02/08 14:20:27 kls Exp $
*/ */
#include "eit.h" #include "eit.h"
@ -220,7 +220,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
case SI::LinkageDescriptorTag: { case SI::LinkageDescriptorTag: {
SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d; SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d;
tChannelID linkID(Source, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId()); tChannelID linkID(Source, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
if (uint(ld->getLinkageType()) == 0xB0) { // Premiere World if (ld->getLinkageType() == SI::LinkageTypePremiere) { // Premiere World
bool hit = StartTime <= Now && Now < StartTime + Duration; bool hit = StartTime <= Now && Now < StartTime + Duration;
if (hit) { if (hit) {
char linkName[ld->privateData.getLength() + 1]; char linkName[ld->privateData.getLength() + 1];

5
libsi/si.h
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: si.h 3.1 2013/10/30 10:16:18 kls Exp $ * $Id: si.h 3.2 2014/02/08 14:11:32 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -210,7 +210,8 @@ enum LinkageType { LinkageTypeInformationService = 0x01,
LinkageTypeRCSMap = 0x07, LinkageTypeRCSMap = 0x07,
LinkageTypeMobileHandover = 0x08, LinkageTypeMobileHandover = 0x08,
LinkageTypeSystemSoftwareUpdateService = 0x09, LinkageTypeSystemSoftwareUpdateService = 0x09,
LinkageTypeTSContainingSsuBatOrNit = 0x0A LinkageTypeTSContainingSsuBatOrNit = 0x0A,
LinkageTypePremiere = 0xB0
}; };
enum AudioType { AudioTypeUndefined = 0x00, enum AudioType { AudioTypeUndefined = 0x00,