Updated patches.

This commit is contained in:
Rolf Ahrenberg 2010-03-09 16:35:05 +02:00
parent c207b5cf6e
commit 204c6020c4
2 changed files with 4 additions and 4 deletions

View File

@ -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);
}

View File

@ -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()) {