frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed timeout calculation in cFile::FileReady()

This commit is contained in:
Klaus Schmidinger 2001-08-05 12:40:37 +02:00
parent c2ed9b5daf
commit ae15608197
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -112,3 +112,6 @@ Andreas Schultz <aschultz@warp10.net>
Aaron Holtzman
for writing 'ac3dec'
Wolfgang Henselmann-Weiss <Wolfgang_Henselmann@betaresearch.de>
for fixing calculating the timeout value in cFile::FileReady()

2
HISTORY
View File

@ -619,3 +619,5 @@ Video Disk Recorder Revision History
- Fixed replay progress display in case replay is paused while watching an
ongoing recording.
- Ringbuffer uses semaphores to signal empty/full conditions.
- Fixed calculating the timeout value in cFile::FileReady() (thanks to
Wolfgang Henselmann-Weiss).

6
tools.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: tools.c 1.34 2001/05/20 08:30:54 kls Exp $
* $Id: tools.c 1.35 2001/08/05 12:38:06 kls Exp $
*/
#define _GNU_SOURCE
@ -406,8 +406,8 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
FD_SET(FileDes, &set);
if (TimeoutMs < 100)
TimeoutMs = 100;
timeout.tv_sec = 0;
timeout.tv_usec = TimeoutMs * 1000;
timeout.tv_sec = TimeoutMs / 1000;
timeout.tv_usec = (TimeoutMs % 1000) * 1000;
return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
}