diff --git a/HISTORY b/HISTORY index 5db801f..142e3ad 100644 --- a/HISTORY +++ b/HISTORY @@ -137,3 +137,7 @@ VDR Plugin 'iptv' Revision History - Fixed channel parameter corruption. - Added Dutch translation (Thanks to Carel). + +2010-xx-xx: Version 0.4.2 + +- Updated for vdr-1.7.14. diff --git a/device.c b/device.c index 4a29155..d79425c 100644 --- a/device.c +++ b/device.c @@ -181,7 +181,7 @@ cString cIptvDevice::GetInformation(unsigned int Page) bool cIptvDevice::ProvidesSource(int Source) const { debug("cIptvDevice::ProvidesSource(%d)\n", deviceIndex); - return ((Source & cSource::st_Mask) == (IPTV_SOURCE_CHARACTER << 24)); + return (cSource::IsType(Source, IPTV_SOURCE_CHARACTER)); } bool cIptvDevice::ProvidesTransponder(const cChannel *Channel) const diff --git a/iptv.c b/iptv.c index a4ed391..9067e7b 100644 --- a/iptv.c +++ b/iptv.c @@ -12,11 +12,11 @@ #include "setup.h" #include "device.h" -#if defined(APIVERSNUM) && APIVERSNUM < 10713 -#error "VDR-1.7.13 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 10714 +#error "VDR-1.7.14 API version or greater is required!" #endif -static const char VERSION[] = "0.4.1"; +static const char VERSION[] = "0.4.2"; static const char DESCRIPTION[] = trNOOP("Experience the IPTV"); class cPluginIptv : public cPlugin { diff --git a/patches/vdr-1.7.13-disable_ca_updates.patch b/patches/vdr-1.7.14-disable_ca_updates.patch similarity index 55% rename from patches/vdr-1.7.13-disable_ca_updates.patch rename to patches/vdr-1.7.14-disable_ca_updates.patch index aa394ea..0a56ed0 100644 --- a/patches/vdr-1.7.13-disable_ca_updates.patch +++ b/patches/vdr-1.7.14-disable_ca_updates.patch @@ -1,11 +1,11 @@ -diff -Nru vdr-1.7.13-vanilla/pat.c vdr-1.7.13-disable_ca_updates/pat.c ---- vdr-1.7.13-vanilla/pat.c 2010-01-01 17:40:05.000000000 +0200 -+++ vdr-1.7.13-disable_ca_updates/pat.c 2010-03-09 16:33:03.000000000 +0200 -@@ -458,6 +458,7 @@ +diff -Nru vdr-1.7.14-vanilla/pat.c vdr-1.7.14-disable_ca_updates/pat.c +--- vdr-1.7.14-vanilla/pat.c 2010-03-14 16:57:06.000000000 +0200 ++++ vdr-1.7.14-disable_ca_updates/pat.c 2010-03-14 17:35:55.000000000 +0200 +@@ -481,6 +481,7 @@ } if (Setup.UpdateChannels >= 2) { Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid); -+ if ((Channel->Source() & cSource::st_Mask) != ('I' << 24)) ++ if (!cSource::IsType(Channel->Source(), 'I')) Channel->SetCaIds(CaDescriptors->CaIds()); Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds); } diff --git a/patches/vdr-1.7.13-disable_eitscan.patch b/patches/vdr-1.7.14-disable_eitscan.patch similarity index 66% rename from patches/vdr-1.7.13-disable_eitscan.patch rename to patches/vdr-1.7.14-disable_eitscan.patch index 24a8543..6e1d296 100644 --- a/patches/vdr-1.7.13-disable_eitscan.patch +++ b/patches/vdr-1.7.14-disable_eitscan.patch @@ -1,12 +1,12 @@ -diff -Nru vdr-1.7.13-vanilla/eitscan.c vdr-1.7.13-disable_eitscan/eitscan.c ---- vdr-1.7.13-vanilla/eitscan.c 2010-02-07 14:12:05.000000000 +0200 -+++ vdr-1.7.13-disable_eitscan/eitscan.c 2010-03-09 16:30:02.000000000 +0200 +diff -Nru vdr-1.7.14-vanilla/eitscan.c vdr-1.7.14-disable_eitscan/eitscan.c +--- vdr-1.7.14-vanilla/eitscan.c 2010-03-14 16:57:06.000000000 +0200 ++++ vdr-1.7.14-disable_eitscan/eitscan.c 2010-03-14 17:34:16.000000000 +0200 @@ -146,7 +146,7 @@ if (Device) { for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) { const cChannel *Channel = ScanData->GetChannel(); - if (Channel) { -+ if (Channel && ((Channel->Source() & cSource::st_Mask) != ('I' << 24))) { ++ if (Channel && !cSource::IsType(Channel->Source(), 'I')) { if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { if (Device->ProvidesTransponder(Channel)) { if (!Device->Receiving()) {