summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--device.h6
3 files changed, 6 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index af962b67..6cb72d1c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1768,6 +1768,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
for adding a missing 'const' to cRecording::FramesPerSecond()
for modifying cCharSetConv so that it can be used to convert from "whatever VDR uses"
to a given code
+ for adding some missing 'const' to cDevice
Sascha Klek <sklek@gmx.de>
for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
diff --git a/HISTORY b/HISTORY
index fe704895..b1d897a1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6847,7 +6847,7 @@ Video Disk Recorder Revision History
- Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4
(backport from version 1.7.9, thanks to Ralf Schueler).
-2012-02-13: Version 1.7.24
+2012-02-14: Version 1.7.24
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a high load in case a transponder can't be received.
@@ -6872,3 +6872,4 @@ Video Disk Recorder Revision History
- No longer using tabs as delimiter in the EPG bugfix log (they were garbled in the
log file).
- Added a missing '.' after the month in VPS strings.
+- Added some missing 'const' to cDevice (thanks to Joachim Wilke).
diff --git a/device.h b/device.h
index c7f2640f..9a459345 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.32 2012/01/18 12:12:49 kls Exp $
+ * $Id: device.h 2.33 2012/02/14 14:42:42 kls Exp $
*/
#ifndef __DEVICE_H
@@ -498,11 +498,11 @@ public:
///< is more than one audio track.
int NumSubtitleTracks(void) const;
///< Returns the number of subtitle tracks that are currently available.
- eTrackType GetCurrentAudioTrack(void) { return currentAudioTrack; }
+ eTrackType GetCurrentAudioTrack(void) const { return currentAudioTrack; }
bool SetCurrentAudioTrack(eTrackType Type);
///< Sets the current audio track to the given Type.
///< \return Returns true if Type is a valid audio track, false otherwise.
- eTrackType GetCurrentSubtitleTrack(void) { return currentSubtitleTrack; }
+ eTrackType GetCurrentSubtitleTrack(void) const { return currentSubtitleTrack; }
bool SetCurrentSubtitleTrack(eTrackType Type, bool Manual = false);
///< Sets the current subtitle track to the given Type.
///< IF Manual is true, no automatic preferred subtitle language selection