From c066f803f10090239b76c6e1a2fcf8daa31c3f8a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 21 Jun 2011 21:45:08 +0200
Subject: [PATCH] Added some missing 'const' to tChannelID

---
 CONTRIBUTORS |  1 +
 HISTORY      |  4 ++++
 channels.h   | 12 ++++++------
 config.h     | 10 +++++-----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b9cc3824..47782f81 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2509,6 +2509,7 @@ Johan Schuring <johan.schuring@vetteblei.nl>
 
 Sundararaj Reel <sundararaj.reel@googlemail.com>
  for reporting a missing reset of maxNumber in cChannels::Renumber()
+ for reporting some missing 'const' in tChannelID
 
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
diff --git a/HISTORY b/HISTORY
index 015a1019..46a61bb8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6649,3 +6649,7 @@ Video Disk Recorder Revision History
   Lars Bläser).
 - Added support for "content identifier descriptor" and "default authority descriptor"
   to 'libsi' (thanks to Dave Pickles).
+
+2011-06-21: Version 1.7.20
+
+- Added some missing 'const' to tChannelID (reported by Sundararaj Reel).
diff --git a/channels.h b/channels.h
index b8672974..05250934 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.12 2010/06/05 13:12:54 kls Exp $
+ * $Id: channels.h 2.13 2011/06/21 21:42:38 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -61,11 +61,11 @@ public:
   bool Valid(void) const { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   tChannelID &ClrPolarization(void);
-  int Source(void) { return source; }
-  int Nid(void) { return nid; }
-  int Tid(void) { return tid; }
-  int Sid(void) { return sid; }
-  int Rid(void) { return rid; }
+  int Source(void)  const { return source; }
+  int Nid(void)  const { return nid; }
+  int Tid(void)  const { return tid; }
+  int Sid(void)  const { return sid; }
+  int Rid(void)  const { return rid; }
   static tChannelID FromString(const char *s);
   cString ToString(void) const;
   static const tChannelID InvalidID;
diff --git a/config.h b/config.h
index f3421f7a..19f87686 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.32 2011/06/13 14:24:40 kls Exp $
+ * $Id: config.h 2.33 2011/06/21 21:43:01 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.19"
-#define VDRVERSNUM   10719  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.20"
+#define VDRVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.19"
-#define APIVERSNUM   10719  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.20"
+#define APIVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to