From bb47d52f95f054db9e90f440929ea5a840456c87 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 16 Feb 2013 13:06:16 +0100
Subject: Added missing 'const' to cDevice::HasProgramme() and
 cDevice::HasLock()

---
 HISTORY     | 1 +
 device.c    | 6 +++---
 device.h    | 6 +++---
 dvbdevice.c | 4 ++--
 dvbdevice.h | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/HISTORY b/HISTORY
index 94139d74..4238d3f7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -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().
diff --git a/device.c b/device.c
index af416411..31f7aded 100644
--- a/device.c
+++ b/device.c
@@ -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;
 }
diff --git a/device.h b/device.h
index a6254517..9104cfc6 100644
--- a/device.h
+++ b/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.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.
 
diff --git a/dvbdevice.c b/dvbdevice.c
index af374c5d..05a70962 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -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;
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index 6dca3859..d3218d2b 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -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
 
-- 
cgit v1.2.3