From 8c1c92bff6a032582e480268ecc7048ecbf86fcd Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 16 Oct 2020 13:42:13 +0200 Subject: [PATCH] Added checking the symbol rate to cDvbTuner::IsTunedTo(), which apparently got lost in version 1.7.13 --- CONTRIBUTORS | 2 ++ HISTORY | 4 +++- dvbdevice.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 8254ed02..de59b317 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3622,6 +3622,8 @@ Helmut Binder been active since version 1.7.29 for fixing handling inactive shared CA pids for implementing handling multi packet CATs with MTD + for adding checking the symbol rate to cDvbTuner::IsTunedTo(), which apparently got + lost in version 1.7.13 Ulrich Eckhardt for reporting a problem with shutdown after user inactivity in case a plugin is diff --git a/HISTORY b/HISTORY index 96739a01..9e50ea2a 100644 --- a/HISTORY +++ b/HISTORY @@ -9513,7 +9513,7 @@ Video Disk Recorder Revision History with the main menu open. - Official release. -2020-10-15: Version 2.4.5 +2020-10-16: Version 2.4.5 - Updated the Italian OSD texts (thanks to Diego Pierotto). - Fixed handling newline characters in ci.c's CopyString() (reported by Winfried Köhler). @@ -9528,3 +9528,5 @@ Video Disk Recorder Revision History - Fixed alignment of semi-circles in case of odd sizes. - Increased the size of the TS buffer to 16MB, to have more reserve when recording several HD programmes. +- Added checking the symbol rate to cDvbTuner::IsTunedTo(), which apparently got lost + in version 1.7.13 (thanks to Helmut Binder). diff --git a/dvbdevice.c b/dvbdevice.c index df9510ba..1ec903ee 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 4.24 2020/10/15 10:16:38 kls Exp $ + * $Id: dvbdevice.c 4.25 2020/10/16 13:42:13 kls Exp $ */ #include "dvbdevice.h" @@ -792,7 +792,7 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const { if (tunerStatus == tsIdle) return false; // not tuned to - if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder()) + if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder() || channel.Srate() != Channel->Srate()) return false; // sufficient mismatch // Polarization is already checked as part of the Transponder. return strcmp(channel.Parameters(), Channel->Parameters()) == 0;