frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed accessing the actual frontend on multi frontend devices

Browse Source
This commit is contained in:
Klaus Schmidinger 2019-03-10 12:10:01 +01:00
parent b9162ad7bd
commit 18bb52554f
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3569,6 +3569,7 @@ Helmut Binder <cco@aon.at>
for fixing switching through encrypted channels with the Up/Down keys for fixing switching through encrypted channels with the Up/Down keys
for deactivating MTD support if a non MCD capable CAM is inserted after removing for deactivating MTD support if a non MCD capable CAM is inserted after removing
a previously used CAM that is MCD capable a previously used CAM that is MCD capable
for fixing accessing the actual frontend on multi frontend devices
Ulrich Eckhardt <uli@uli-eckhardt.de> Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is for reporting a problem with shutdown after user inactivity in case a plugin is

1
HISTORY
View File

@ -9373,3 +9373,4 @@ Video Disk Recorder Revision History
manuals of multi frontend DVB cards. manuals of multi frontend DVB cards.
- Reverted the change "The EIT filter no longer parses data from "other TS"...". It led to - Reverted the change "The EIT filter no longer parses data from "other TS"...". It led to
missing EPG data on channels from Canal Digital Norway (reported by Stian B. Barmen). missing EPG data on channels from Canal Digital Norway (reported by Stian B. Barmen).
- Fixed accessing the actual frontend on multi frontend devices (thanks to Helmut Binder).

8
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: dvbdevice.c 4.18 2018/10/29 12:22:11 kls Exp $ * $Id: dvbdevice.c 4.19 2019/03/10 12:03:20 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -571,6 +571,7 @@ public:
bool ProvidesDeliverySystem(int DeliverySystem) const; bool ProvidesDeliverySystem(int DeliverySystem) const;
bool ProvidesModulation(int System, int StreamId, int Modulation) const; bool ProvidesModulation(int System, int StreamId, int Modulation) const;
bool ProvidesFrontend(const cChannel *Channel, bool Activate = false) const; bool ProvidesFrontend(const cChannel *Channel, bool Activate = false) const;
int Frontend(void) const { return frontend; }
int FrontendType(void) const { return frontendType; } int FrontendType(void) const { return frontendType; }
const char *FrontendName(void) { return dvbFrontend->FrontendName(); } const char *FrontendName(void) { return dvbFrontend->FrontendName(); }
int NumProvidedSystems(void) const { return numDeliverySystems + numModulations; } int NumProvidedSystems(void) const { return numDeliverySystems + numModulations; }
@ -1869,6 +1870,11 @@ int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportEr
return fd; return fd;
} }
int cDvbDevice::Frontend(void) const
{
return dvbTuner ? dvbTuner->Frontend() : frontend;
}
bool cDvbDevice::Exists(int Adapter, int Frontend) bool cDvbDevice::Exists(int Adapter, int Frontend)
{ {
cString FileName = DvbName(DEV_DVB_FRONTEND, Adapter, Frontend); cString FileName = DvbName(DEV_DVB_FRONTEND, Adapter, Frontend);

4
dvbdevice.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: dvbdevice.h 4.5 2018/10/20 11:39:11 kls Exp $ * $Id: dvbdevice.h 4.6 2019/03/10 12:01:15 kls Exp $
*/ */
#ifndef __DVBDEVICE_H #ifndef __DVBDEVICE_H
@ -189,7 +189,7 @@ public:
cDvbDevice(int Adapter, int Frontend); cDvbDevice(int Adapter, int Frontend);
virtual ~cDvbDevice(); virtual ~cDvbDevice();
int Adapter(void) const { return adapter; } int Adapter(void) const { return adapter; }
int Frontend(void) const { return frontend; } int Frontend(void) const;
virtual cString DeviceType(void) const; virtual cString DeviceType(void) const;
virtual cString DeviceName(void) const; virtual cString DeviceName(void) const;
static bool BondDevices(const char *Bondings); static bool BondDevices(const char *Bondings);