diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2012-03-07 14:00:28 +0100 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-03-07 14:00:28 +0100 |
commit | 680b1b8f8721c0462f04e838dcafd799a10b5574 (patch) | |
tree | 929957eeca83cb9371a16b6d82673777ea050fd3 | |
parent | 40d06559bb1f4ac515fe62f913238882a8597cf6 (diff) | |
download | vdr-680b1b8f8721c0462f04e838dcafd799a10b5574.tar.gz vdr-680b1b8f8721c0462f04e838dcafd799a10b5574.tar.bz2 |
Removed the calls to EITScanner.UsesDevice(this) from dvb[hs]ddevice.c
-rw-r--r-- | HISTORY | 3 | ||||
-rw-r--r-- | PLUGINS/src/dvbsddevice/HISTORY | 6 | ||||
-rw-r--r-- | PLUGINS/src/dvbsddevice/dvbsddevice.c | 4 | ||||
-rw-r--r-- | PLUGINS/src/dvbsddevice/dvbsdffdevice.c | 9 |
4 files changed, 12 insertions, 10 deletions
@@ -6981,3 +6981,6 @@ Video Disk Recorder Revision History by using "occupied". - Fixed selecting devices for the EPG scan in case the primary device is bonded with an other one. +- Removed the calls to EITScanner.UsesDevice(this) from dvb[hs]ddevice.c, because + the code following these calls is only executed if LiveView is true, which is + never the case when the EITScanner switches to a channel. diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY index 229e35b0..676dd6fc 100644 --- a/PLUGINS/src/dvbsddevice/HISTORY +++ b/PLUGINS/src/dvbsddevice/HISTORY @@ -23,3 +23,9 @@ VDR Plugin 'dvbsddevice' Revision History 2011-08-27: Version 0.0.5 - Added option --outputonly to use the device only for output (thanks to Udo Richter). + +2012-03-07: Version 0.06 + +- Removed the call to EITScanner.UsesDevice(this) from dvbsddevice.c, because + the code following these calls is only executed if LiveView is true, which is + never the case when the EITScanner switches to a channel. diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c index 2aa8c77d..7f1dde48 100644 --- a/PLUGINS/src/dvbsddevice/dvbsddevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsddevice.c 1.5 2011/08/27 11:34:58 kls Exp $ + * $Id: dvbsddevice.c 1.6 2012/03/07 13:58:08 kls Exp $ */ #include <getopt.h> #include <vdr/plugin.h> #include "dvbsdffdevice.h" -static const char *VERSION = "0.0.5"; +static const char *VERSION = "0.0.6"; static const char *DESCRIPTION = "SD Full Featured DVB device"; class cPluginDvbsddevice : public cPlugin { diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c index cc6af339..25be281a 100644 --- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsdffdevice.c 2.31 2012/02/15 13:15:05 kls Exp $ + * $Id: dvbsdffdevice.c 2.32 2012/03/07 13:52:48 kls Exp $ */ #include "dvbsdffdevice.h" @@ -421,13 +421,6 @@ bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) if (!cDvbDevice::SetChannelDevice(Channel, LiveView)) return false; - // If this channel switch was requested by the EITScanner we don't wait for - // a lock and don't set any live PIDs (the EITScanner will wait for the lock - // by itself before setting any filters): - - if (EITScanner.UsesDevice(this)) //XXX - return true; - // PID settings: if (TurnOnLivePIDs) { |