The function SetCurrentChannel(const cChannel *Channel) is now deprecated

2 files changed, 8 insertions, 1 deletions

diff --git a/HISTORY b/HISTORY
index 89b4d2c5..58290393 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8834,3 +8834,6 @@ Video Disk Recorder Revision History
 - Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer).
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Fixed initializing device specific parameters in cDvbTransponderParameters.
+- The function SetCurrentChannel(const cChannel *Channel) is now deprecated and
+  may be removed in a future version. Use SetCurrentChannel(int ChannelNumber)
+  instead.
diff --git a/device.h b/device.h
index 31ee3038..9475d23a 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 4.1 2015/04/19 12:12:43 kls Exp $
+ * $Id: device.h 4.2 2016/12/06 14:12:39 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -322,7 +322,11 @@ protected:
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+#define DEPRECATED_SETCURRENTCHANNEL
+#ifdef DEPRECATED_SETCURRENTCHANNEL
   static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
+#endif
+  static void SetCurrentChannel(int ChannelNumber) { currentChannel = ChannelNumber; }
          ///< Sets the number of the current channel on the primary device, without
          ///< actually switching to it. This can be used to correct the current
          ///< channel number while replaying.