From 79dad980cfd29e43ab19ab6264469fc5b49c9dec Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 25 Jan 2013 10:52:43 +0100 Subject: Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given --- HISTORY | 3 ++- PLUGINS/src/dvbsddevice/HISTORY | 4 ++++ PLUGINS/src/dvbsddevice/dvbsddevice.c | 4 ++-- PLUGINS/src/dvbsddevice/dvbsdffdevice.c | 9 ++++++++- PLUGINS/src/dvbsddevice/dvbsdffdevice.h | 3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/HISTORY b/HISTORY index 6ba9cd95..ee6cf6ce 100644 --- a/HISTORY +++ b/HISTORY @@ -7534,7 +7534,7 @@ Video Disk Recorder Revision History - Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings in case the primary device can't handle the current live signal. -2013-01-24: Version 1.7.37 +2013-01-25: Version 1.7.37 - Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch). - Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly). @@ -7545,3 +7545,4 @@ Video Disk Recorder Revision History which resulted in empty lines between scaled subtitles. - Fixed a leftover line in case a two line subtitle was followed by a one line subtitle on the dvbhddevice in "high level" OSD mode. +- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given. diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY index 5cca3ec2..e1f98548 100644 --- a/PLUGINS/src/dvbsddevice/HISTORY +++ b/PLUGINS/src/dvbsddevice/HISTORY @@ -37,3 +37,7 @@ VDR Plugin 'dvbsddevice' Revision History 2013-01-12: Version 0.0.8 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-01-25: Version 0.0.9 + +- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given. diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c index 7f91d404..8ebfe2b6 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.8 2013/01/12 14:12:07 kls Exp $ + * $Id: dvbsddevice.c 1.9 2013/01/25 10:48:50 kls Exp $ */ #include #include #include "dvbsdffdevice.h" -static const char *VERSION = "0.0.8"; +static const char *VERSION = "0.0.9"; 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 56018792..f9ff5b32 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.33 2012/03/11 13:32:42 kls Exp $ + * $Id: dvbsdffdevice.c 2.34 2013/01/25 10:48:29 kls Exp $ */ #include "dvbsdffdevice.h" @@ -362,6 +362,13 @@ bool cDvbSdFfDevice::ProvidesSource(int Source) const return cDvbDevice::ProvidesSource(Source); } +int cDvbSdFfDevice::NumProvidedSystems(void) const +{ + if (outputOnly) + return 0; + return cDvbDevice::NumProvidedSystems(); +} + void cDvbSdFfDevice::TurnOffLiveMode(bool LiveView) { if (LiveView) { diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h index 79b4e3d8..dc55148f 100644 --- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h +++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsdffdevice.h 2.14 2012/12/03 13:43:55 kls Exp $ + * $Id: dvbsdffdevice.h 2.15 2013/01/25 10:43:14 kls Exp $ */ #ifndef __DVBSDFFDEVICE_H @@ -37,6 +37,7 @@ public: public: virtual bool ProvidesSource(int Source) const; + virtual int NumProvidedSystems(void) const; private: void TurnOffLiveMode(bool LiveView); protected: -- cgit v1.2.3