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

cDevice::IsPrimaryDevice() now also checks whether the primary device actually has a decoder and returns false otherwise

This commit is contained in:
Klaus Schmidinger 2013-08-22 12:02:12 +02:00
parent 1f0a55ca7d
commit 6e6e468148
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -7821,3 +7821,6 @@ Video Disk Recorder Revision History
- Fixed handling LIRC events in case repeated events are lost. - Fixed handling LIRC events in case repeated events are lost.
- Fixed a possible crash when shutting down VDR while subtitles are being displayed - Fixed a possible crash when shutting down VDR while subtitles are being displayed
(reported by Ville Skyttä). (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
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: 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 #ifndef __DEVICE_H
@ -196,7 +196,7 @@ protected:
///< A derived class must call the MakePrimaryDevice() function of its ///< A derived class must call the MakePrimaryDevice() function of its
///< base class. ///< base class.
public: public:
bool IsPrimaryDevice(void) const { return this == primaryDevice; } bool IsPrimaryDevice(void) const { return this == primaryDevice && HasDecoder(); }
int CardIndex(void) const { return cardIndex; } int CardIndex(void) const { return cardIndex; }
///< Returns the card index of this device (0 ... MAXDEVICES - 1). ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
int DeviceNumber(void) const; int DeviceNumber(void) const;