From eff00653c553bb1330c6bf80e6cd8039cd2499b7 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 16 Oct 2004 12:57:51 +0200 Subject: [PATCH] Moved the initialization of aPid1 and aPid2 to the beginning of cDvbDevice::cDvbDevice() --- CONTRIBUTORS | 2 ++ HISTORY | 3 +++ dvbdevice.c | 5 ++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3bf9979c..ad5b9f12 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1030,6 +1030,8 @@ Michal Dobrzynski Wayne Keer for reporting a bug in handling descriptor loops in 'libsi', which had sometimes caused invalid CA ids to be added to the channel definitions + for pointing out a problem with the initialization of aPid1 and aPid2 in + cDvbDevice::cDvbDevice() in case a patch references them Marco Schlüßler for fixing handling colors in cDvbSpuPalette::yuv2rgb() diff --git a/HISTORY b/HISTORY index 0a4e415a..171769eb 100644 --- a/HISTORY +++ b/HISTORY @@ -3015,3 +3015,6 @@ Video Disk Recorder Revision History - Added Estonian language texts (thanks to Arthur Konovalov). - Fixed 'newplugin' to use the compiler defined in $(CXX) for generating file dependencies (thanks to Andreas Brachold). +- Moved the initialization of aPid1 and aPid2 to the beginning of cDvbDevice::cDvbDevice() + to have them set in case a patch references them (thanks to Wayne Keer for pointing + this out). diff --git a/dvbdevice.c b/dvbdevice.c index 56564afb..45e32b28 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.94 2004/10/15 13:07:52 kls Exp $ + * $Id: dvbdevice.c 1.95 2004/10/16 12:51:56 kls Exp $ */ #include "dvbdevice.h" @@ -307,6 +307,7 @@ cDvbDevice::cDvbDevice(int n) frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN spuDecoder = NULL; playMode = pmNone; + aPid1 = aPid2 = 0; // Devices that are present on all card types: @@ -371,8 +372,6 @@ cDvbDevice::cDvbDevice(int n) else esyslog("ERROR: can't open DVB device %d", n); - aPid1 = aPid2 = 0; - StartSectionHandler(); }