From 8e4a745ada27e4538b3a75e4b39d7784ea7d1802 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 9 Nov 2003 11:21:06 +0100 Subject: [PATCH] Fixed handling Priority -1 in cDvbDevice::ProvidesChannel() --- CONTRIBUTORS | 1 + HISTORY | 5 +++++ dvbdevice.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9fc0ef8e..e72cc733 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -649,6 +649,7 @@ Torsten Herz for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix for fixing a bug in resetting OSD color palettes for adding missing 'const' to some cChannel member functions + for fixing handling Priority -1 in cDvbDevice::ProvidesChannel() Steffen Becker for reporting a problem with CPU load peaks (in the EPG scanner) diff --git a/HISTORY b/HISTORY index 7cde22cf..eb28cbab 100644 --- a/HISTORY +++ b/HISTORY @@ -2460,6 +2460,11 @@ Video Disk Recorder Revision History - Fixed getting the list of recordings in case VDR is started from a directory where it doesn't have access to (thanks to Dirk Mueller). +2003-11-09: Version 1.2.6pre6 + +- Fixed handling Priority -1 in cDvbDevice::ProvidesChannel() (thanks to + Torsten Herz). + 2003-10-24: Version 1.3.0 - Changed thread handling to make it work with NPTL ("Native Posix Thread Library"). diff --git a/dvbdevice.c b/dvbdevice.c index 953d2787..edebaa2d 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.71 2003/11/07 14:16:25 kls Exp $ + * $Id: dvbdevice.c 1.72 2003/11/09 11:19:00 kls Exp $ */ #include "dvbdevice.h" @@ -653,7 +653,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) { result = hasPriority; - if (Receiving()) { + if (Priority >= 0 && Receiving()) { if (dvbTuner->IsTunedTo(Channel)) { if (!HasPid(Channel->Vpid())) { #ifdef DO_MULTIPLE_RECORDINGS