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

Fixed a possible hangup when ending a replay session while cIndexFile::CatchUp() is waiting

This commit is contained in:
Klaus Schmidinger 2005-05-22 11:29:19 +02:00
parent 6b25832913
commit a05590796a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1176,6 +1176,8 @@ Marco Schl
for adding cPlayer::DeviceSetVideoDisplayFormat() for adding cPlayer::DeviceSetVideoDisplayFormat()
for making the setup not being saved in case of a fatal error, to keep the volume for making the setup not being saved in case of a fatal error, to keep the volume
level from being set to a wrong value level from being set to a wrong value
for fixing a possible hangup when ending a replay session while cIndexFile::CatchUp()
is waiting
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

2
HISTORY
View File

@ -3551,3 +3551,5 @@ Video Disk Recorder Revision History
- Added cPlayer::DeviceSetVideoDisplayFormat() (thanks to Marco Schlüßler). - Added cPlayer::DeviceSetVideoDisplayFormat() (thanks to Marco Schlüßler).
- No longer saving the setup in case of a fatal error, to keep the volume level - No longer saving the setup in case of a fatal error, to keep the volume level
from being set to a wrong value (thanks to Marco Schlüßler). from being set to a wrong value (thanks to Marco Schlüßler).
- Fixed a possible hangup when ending a replay session while cIndexFile::CatchUp()
is waiting (thanks to Marco Schlüßler).

4
dvbplayer.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: dvbplayer.c 1.33 2005/05/08 14:07:00 kls Exp $ * $Id: dvbplayer.c 1.34 2005/05/22 11:26:51 kls Exp $
*/ */
#include "dvbplayer.h" #include "dvbplayer.h"
@ -355,7 +355,7 @@ void cDvbPlayer::Activate(bool On)
} }
else if (active) { else if (active) {
running = false; running = false;
Cancel(3); Cancel(9);
active = false; active = false;
} }
} }

4
recording.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: recording.c 1.102 2005/05/22 10:43:10 kls Exp $ * $Id: recording.c 1.103 2005/05/22 11:27:28 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -1043,7 +1043,7 @@ bool cIndexFile::CatchUp(int Index)
LOG_ERROR_STR(fileName); LOG_ERROR_STR(fileName);
if (Index < last - (i ? 2 * INDEXSAFETYLIMIT : 0) || Index > 10 * INDEXSAFETYLIMIT) // keep off the end in case of "Pause live video" if (Index < last - (i ? 2 * INDEXSAFETYLIMIT : 0) || Index > 10 * INDEXSAFETYLIMIT) // keep off the end in case of "Pause live video"
break; break;
sleep(1); cCondWait::SleepMs(1000);
} }
} }
return index != NULL; return index != NULL;