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

Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock()

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-02-16 13:06:16 +01:00
parent cd2ed6cfe7
commit bb47d52f95
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -7628,3 +7628,4 @@ Video Disk Recorder Revision History
- Fixed some spellings in PLUGINS.html and Doxyfile (thanks to Ville Skyttä).
- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
Ville Skyttä).
- Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().

6
device.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: device.c 2.71 2013/02/01 12:00:09 kls Exp $
* $Id: device.c 2.72 2013/02/16 13:05:06 kls Exp $
*/
#include "device.h"
@ -845,12 +845,12 @@ bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
return false;
}
bool cDevice::HasLock(int TimeoutMs)
bool cDevice::HasLock(int TimeoutMs) const
{
return true;
}
bool cDevice::HasProgramme(void)
bool cDevice::HasProgramme(void) const
{
return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
}

6
device.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: device.h 2.45 2013/02/01 11:54:08 kls Exp $
* $Id: device.h 2.46 2013/02/16 12:47:18 kls Exp $
*/
#ifndef __DEVICE_H
@ -328,13 +328,13 @@ public:
///< after the device has been successfully tuned to the requested transponder.
///< Seconds will be silently limited to MAXOCCUPIEDTIMEOUT. Values less than
///< 0 will be silently ignored.
virtual bool HasLock(int TimeoutMs = 0);
virtual bool HasLock(int TimeoutMs = 0) const;
///< Returns true if the device has a lock on the requested transponder.
///< Default is true, a specific device implementation may return false
///< to indicate that it is not ready yet.
///< If TimeoutMs is not zero, waits for the given number of milliseconds
///< before returning false.
virtual bool HasProgramme(void);
virtual bool HasProgramme(void) const;
///< Returns true if the device is currently showing any programme to
///< the user, either through replaying or live.

4
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.c 2.78 2013/02/14 13:21:34 kls Exp $
* $Id: dvbdevice.c 2.79 2013/02/16 12:47:59 kls Exp $
*/
#include "dvbdevice.h"
@ -1535,7 +1535,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
return true;
}
bool cDvbDevice::HasLock(int TimeoutMs)
bool cDvbDevice::HasLock(int TimeoutMs) const
{
return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
}

4
dvbdevice.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.h 2.26 2012/04/04 09:48:00 kls Exp $
* $Id: dvbdevice.h 2.27 2013/02/16 12:48:11 kls Exp $
*/
#ifndef __DVBDEVICE_H
@ -192,7 +192,7 @@ public:
protected:
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
public:
virtual bool HasLock(int TimeoutMs = 0);
virtual bool HasLock(int TimeoutMs = 0) const;
// PID handle facilities