Fixed cDvbPlayer::NextFile() to handle files larger than 2GB

This commit is contained in:
Klaus Schmidinger 2009-03-28 17:14:53 +01:00
parent 2e4aa1a595
commit d0a42e9c81
3 changed files with 7 additions and 4 deletions

View File

@ -2282,6 +2282,7 @@ Alexander Riedel <alexander-riedel@t-online.de>
Jose Alberto Reguero <jareguero@telefonica.net> Jose Alberto Reguero <jareguero@telefonica.net>
for a patch that fixed part of a crash in i18n character set conversion 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> Patrice Staudt <staudt@engsystem.net>
for adding full weekday names to i18n.c for plugins to use for adding full weekday names to i18n.c for plugins to use

View File

@ -5979,7 +5979,7 @@ Video Disk Recorder Revision History
cDevice class reimplements PlayTs() or PlayPes(), it also needs to make sure this cDevice class reimplements PlayTs() or PlayPes(), it also needs to make sure this
new function works as expected. 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 - Fixed a hangup when replaying a TS recording with subtitles activated (reported
by Timo Helkio). 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 that file I/O overhead is minimized during recording (reported by Günter
Niedermeier). Niedermeier).
- Added command line help for the '-i' option. - Added command line help for the '-i' option.
- Fixed cDvbPlayer::NextFile() to handle files larger than 2GB (thanks to Jose
Alberto Reguero).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "dvbplayer.h"
@ -220,7 +220,7 @@ private:
cFrame *playFrame; cFrame *playFrame;
void TrickSpeed(int Increment); void TrickSpeed(int Increment);
void Empty(void); void Empty(void);
bool NextFile(uchar FileNumber = 0, int FileOffset = -1); bool NextFile(uint16_t FileNumber = 0, off_t FileOffset = -1);
int Resume(void); int Resume(void);
bool Save(void); bool Save(void);
protected: protected:
@ -328,7 +328,7 @@ void cDvbPlayer::Empty(void)
firstPacket = true; firstPacket = true;
} }
bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset) bool cDvbPlayer::NextFile(uint16_t FileNumber, off_t FileOffset)
{ {
if (FileNumber > 0) if (FileNumber > 0)
replayFile = fileName->SetOffset(FileNumber, FileOffset); replayFile = fileName->SetOffset(FileNumber, FileOffset);