diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 7b4cfae4..85048db7 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3261,3 +3261,7 @@ Christian Paulick Mariusz Bialonczyk for reporting a problem with live streaming of encrypted channels, when there are no CA descriptors, yet, on initial tuning + +Tony Houghton + for suggesting to add LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler + warning with Clang 3.4.1 diff --git a/HISTORY b/HISTORY index 6cdd668e..74072c18 100644 --- a/HISTORY +++ b/HISTORY @@ -8192,3 +8192,5 @@ Video Disk Recorder Revision History Users of stable releases shouldn't notice any problems. - 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). +- Added LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler warning with + Clang 3.4.1 (suggested by Tony Houghten). diff --git a/eit.c b/eit.c index 2ecfc9b4..30c017b5 100644 --- a/eit.c +++ b/eit.c @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $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" @@ -220,7 +220,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo case SI::LinkageDescriptorTag: { SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d; 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; if (hit) { char linkName[ld->privateData.getLength() + 1]; diff --git a/libsi/si.h b/libsi/si.h index 80750648..1e65111f 100644 --- a/libsi/si.h +++ b/libsi/si.h @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (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, LinkageTypeMobileHandover = 0x08, LinkageTypeSystemSoftwareUpdateService = 0x09, - LinkageTypeTSContainingSsuBatOrNit = 0x0A + LinkageTypeTSContainingSsuBatOrNit = 0x0A, + LinkageTypePremiere = 0xB0 }; enum AudioType { AudioTypeUndefined = 0x00,