frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-03-20 15:25:06 +01:00
parent d7d57c3d2a
commit a914aed05a
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -2672,3 +2672,6 @@ Frank Neumann <frank.neumann@hp.com>
Gerald Dachs <vdr@dachsweb.de> Gerald Dachs <vdr@dachsweb.de>
for reporting a problem with checking for minimum line length of 21 characters in for reporting a problem with checking for minimum line length of 21 characters in
the LIRC receiver code the LIRC receiver code
Juergen Lock <vdr-l@jelal.kn-bremen.de>
for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE

2
HISTORY
View File

@ -6567,3 +6567,5 @@ Video Disk Recorder Revision History
- Made updating the editing marks during replay react faster in case the marks - Made updating the editing marks during replay react faster in case the marks
file has just been written. file has just been written.
- Fixed horizontal scaling of subtitles (reported by Reinhard Nissl). - Fixed horizontal scaling of subtitles (reported by Reinhard Nissl).
- Fixed cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE (thanks
to Juergen Lock).

7
tools.c
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: tools.c 2.12 2011/02/25 14:58:31 kls Exp $ * $Id: tools.c 2.13 2011/03/20 15:20:00 kls Exp $
*/ */
#include "tools.h" #include "tools.h"
@ -1575,9 +1575,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
cachedstart = min(cachedstart, curpos); cachedstart = min(cachedstart, curpos);
#endif #endif
ssize_t bytesRead = safe_read(fd, Data, Size); ssize_t bytesRead = safe_read(fd, Data, Size);
#ifdef USE_FADVISE
if (bytesRead > 0) { if (bytesRead > 0) {
curpos += bytesRead; curpos += bytesRead;
#ifdef USE_FADVISE
cachedend = max(cachedend, curpos); cachedend = max(cachedend, curpos);
// Read ahead: // Read ahead:
@ -1597,8 +1597,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
} }
else else
ahead = curpos; // jumped -> we really don't want any readahead, otherwise e.g. fast-rewind gets in trouble. ahead = curpos; // jumped -> we really don't want any readahead, otherwise e.g. fast-rewind gets in trouble.
#endif
} }
#ifdef USE_FADVISE
if (cachedstart < cachedend) { if (cachedstart < cachedend) {
if (curpos - cachedstart > READCHUNK * 2) { if (curpos - cachedstart > READCHUNK * 2) {
// current position has moved forward enough, shrink tail window. // current position has moved forward enough, shrink tail window.