summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2016-12-22 09:26:40 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2016-12-22 09:26:40 +0100
commit1135a1f9d5d2ee7a36b717ce0fb8f4093d62f982 (patch)
tree59e76d5caa18557a02494e4f6c4f5c63614f50ce
parentd71544d797039e043284b76a171d648430b112de (diff)
downloadvdr-1135a1f9d5d2ee7a36b717ce0fb8f4093d62f982.tar.gz
vdr-1135a1f9d5d2ee7a36b717ce0fb8f4093d62f982.tar.bz2
Made the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode 'const'
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY4
-rw-r--r--player.h8
3 files changed, 9 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e1a3192d..38cf59ef 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3325,6 +3325,8 @@ Thomas Reufer <thomas@reufer.ch>
for making the 'newplugin' script create the 'po' subdirectory for translations
for suggesting to add a note to the description of cFont::Size(), regarding possible
differences between it and cFont::Height()
+ for making the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode
+ 'const'
Eike Sauer <EikeSauer@t-online.de>
for reporting a problem with channels that need more than 5 TS packets for detecting
diff --git a/HISTORY b/HISTORY
index f869d2b4..3b63099d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8828,7 +8828,7 @@ Video Disk Recorder Revision History
- Empty adaptation field TS packets are now skipped when recording (thanks to
Christopher Reimer, based on the "AFFcleaner" by Stefan Pöschel).
-2016-12-13: Version 2.3.2
+2016-12-22: Version 2.3.2
- Fixed a crash when deleting a recording (reported by Oliver Endriss).
- Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer).
@@ -8853,3 +8853,5 @@ Video Disk Recorder Revision History
operations.
- Added a note to the description of cFont::Size(), regarding possible differences
between it and cFont::Height() (suggested to Thomas Reufer).
+- Made the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode
+ 'const' (thanks to Thomas Reufer).
diff --git a/player.h b/player.h
index 9ec47faa..e53a952d 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: player.h 3.1 2013/12/25 13:25:02 kls Exp $
+ * $Id: player.h 4.1 2016/12/22 09:22:27 kls Exp $
*/
#ifndef __PLAYER_H
@@ -98,9 +98,9 @@ public:
///< skins as a last resort, in case they want to display the state of the
///< current player. The return value is expected to be a short, single line
///< string. The default implementation returns an empty string.
- double FramesPerSecond(void) { return player->FramesPerSecond(); }
- bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
- bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
+ double FramesPerSecond(void) const { return player->FramesPerSecond(); }
+ bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) const { return player->GetIndex(Current, Total, SnapToIFrame); }
+ bool GetReplayMode(bool &Play, bool &Forward, int &Speed) const { return player->GetReplayMode(Play, Forward, Speed); }
static void Launch(cControl *Control);
static void Attach(void);
static void Shutdown(void);