mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
cDevice::IsPrimaryDevice() now also checks whether the primary device actually has a decoder and returns false otherwise
This commit is contained in:
parent
1f0a55ca7d
commit
6e6e468148
3
HISTORY
3
HISTORY
@ -7821,3 +7821,6 @@ Video Disk Recorder Revision History
|
||||
- Fixed handling LIRC events in case repeated events are lost.
|
||||
- Fixed a possible crash when shutting down VDR while subtitles are being displayed
|
||||
(reported by Ville Skyttä).
|
||||
- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
|
||||
a decoder and returns false otherwise. This should improve device allocation on
|
||||
systems that are only used as a receiver and don't actually display anything.
|
||||
|
4
device.h
4
device.h
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: device.h 2.47 2013/02/16 15:20:01 kls Exp $
|
||||
* $Id: device.h 2.47.1.1 2013/08/22 12:01:48 kls Exp $
|
||||
*/
|
||||
|
||||
#ifndef __DEVICE_H
|
||||
@ -196,7 +196,7 @@ protected:
|
||||
///< A derived class must call the MakePrimaryDevice() function of its
|
||||
///< base class.
|
||||
public:
|
||||
bool IsPrimaryDevice(void) const { return this == primaryDevice; }
|
||||
bool IsPrimaryDevice(void) const { return this == primaryDevice && HasDecoder(); }
|
||||
int CardIndex(void) const { return cardIndex; }
|
||||
///< Returns the card index of this device (0 ... MAXDEVICES - 1).
|
||||
int DeviceNumber(void) const;
|
||||
|
Loading…
Reference in New Issue
Block a user