frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed the calls to EITScanner.UsesDevice(this) from dvb[hs]ddevice.c

This commit is contained in:
Klaus Schmidinger 2012-03-07 14:00:28 +01:00
parent 40d06559bb
commit 680b1b8f87
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -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.

6
PLUGINS/src/dvbsddevice/HISTORY
View File

@ -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.

4
PLUGINS/src/dvbsddevice/dvbsddevice.c
View File

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

9
PLUGINS/src/dvbsddevice/dvbsdffdevice.c
View File

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