summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-03-28 17:14:53 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2009-03-28 17:14:53 +0100
commitd0a42e9c819077c1f391544f1e8672bec33ff68c (patch)
tree750b3d8e85771820029e061cb13ae8b277fe8da7
parent2e4aa1a595f6d80c683e1523c88d4c0565dc83a2 (diff)
downloadvdr-d0a42e9c819077c1f391544f1e8672bec33ff68c.tar.gz
vdr-d0a42e9c819077c1f391544f1e8672bec33ff68c.tar.bz2
Fixed cDvbPlayer::NextFile() to handle files larger than 2GB
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--dvbplayer.c6
3 files changed, 7 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 882df402..972d8706 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2282,6 +2282,7 @@ Alexander Riedel <alexander-riedel@t-online.de>
Jose Alberto Reguero <jareguero@telefonica.net>
for a patch that fixed part of a crash in i18n character set conversion
+ for fixing cDvbPlayer::NextFile() to handle files larger than 2GB
Patrice Staudt <staudt@engsystem.net>
for adding full weekday names to i18n.c for plugins to use
diff --git a/HISTORY b/HISTORY
index 95d85dfa..c888c36b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5979,7 +5979,7 @@ Video Disk Recorder Revision History
cDevice class reimplements PlayTs() or PlayPes(), it also needs to make sure this
new function works as expected.
-2009-03-27: Version 1.7.5
+2009-03-28: Version 1.7.5
- Fixed a hangup when replaying a TS recording with subtitles activated (reported
by Timo Helkio).
@@ -6007,3 +6007,5 @@ Video Disk Recorder Revision History
that file I/O overhead is minimized during recording (reported by Günter
Niedermeier).
- Added command line help for the '-i' option.
+- Fixed cDvbPlayer::NextFile() to handle files larger than 2GB (thanks to Jose
+ Alberto Reguero).
diff --git a/dvbplayer.c b/dvbplayer.c
index c206cac3..b86a4bcb 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbplayer.c 2.4 2009/03/13 14:42:56 kls Exp $
+ * $Id: dvbplayer.c 2.5 2009/03/28 17:13:23 kls Exp $
*/
#include "dvbplayer.h"
@@ -220,7 +220,7 @@ private:
cFrame *playFrame;
void TrickSpeed(int Increment);
void Empty(void);
- bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
+ bool NextFile(uint16_t FileNumber = 0, off_t FileOffset = -1);
int Resume(void);
bool Save(void);
protected:
@@ -328,7 +328,7 @@ void cDvbPlayer::Empty(void)
firstPacket = true;
}
-bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset)
+bool cDvbPlayer::NextFile(uint16_t FileNumber, off_t FileOffset)
{
if (FileNumber > 0)
replayFile = fileName->SetOffset(FileNumber, FileOffset);