From 204c6020c4c6ca18c314c5ce1db123ba8cc3b49a Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Tue, 9 Mar 2010 16:35:05 +0200 Subject: [PATCH] Updated patches. --- patches/vdr-1.7.13-disable_ca_updates.patch | 4 ++-- patches/vdr-1.7.13-disable_eitscan.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/vdr-1.7.13-disable_ca_updates.patch b/patches/vdr-1.7.13-disable_ca_updates.patch index 71ebcf8..aa394ea 100644 --- a/patches/vdr-1.7.13-disable_ca_updates.patch +++ b/patches/vdr-1.7.13-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-04 13:44:28.000000000 +0200 ++++ vdr-1.7.13-disable_ca_updates/pat.c 2010-03-09 16:33:03.000000000 +0200 @@ -458,6 +458,7 @@ } if (Setup.UpdateChannels >= 2) { Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid); -+ if (!Channel->IsPlug()) ++ if ((Channel->Source() & cSource::st_Mask) != ('I' << 24)) 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.13-disable_eitscan.patch index de3dc95..24a8543 100644 --- a/patches/vdr-1.7.13-disable_eitscan.patch +++ b/patches/vdr-1.7.13-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-04 13:44:17.000000000 +0200 ++++ vdr-1.7.13-disable_eitscan/eitscan.c 2010-03-09 16:30:02.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->IsPlug()) { ++ if (Channel && ((Channel->Source() & cSource::st_Mask) != ('I' << 24))) { if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { if (Device->ProvidesTransponder(Channel)) { if (!Device->Receiving()) {