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 timeout when pressing '0' to set an editing mark while the progress display is not shown

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-09-21 16:01:45 +02:00
parent 9309c176e9
commit 7fc8b39f43
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -766,4 +766,5 @@ Video Disk Recorder Revision History
DVD support! DVD support!
- Several fixes to the replay mode display (thanks to Stefan Huelswitt): - Several fixes to the replay mode display (thanks to Stefan Huelswitt):
no more replay mode display when pressing the "Green" or "Yellow" button no more replay mode display when pressing the "Green" or "Yellow" button
(Skip +/-60s); (Skip +/-60s); fixed timeout when pressing '0' to set an editing mark while
the progress display is not shown;

8
menu.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: menu.c 1.121 2001/09/21 15:01:43 kls Exp $ * $Id: menu.c 1.122 2001/09/21 15:46:21 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2388,8 +2388,7 @@ void cReplayControl::Show(int Seconds)
{ {
if (!visible) { if (!visible) {
shown = ShowProgress(true); shown = ShowProgress(true);
if (shown && Seconds > 0) timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0;
timeoutShow = time(NULL) + Seconds;
} }
} }
@ -2427,7 +2426,8 @@ void cReplayControl::ShowMode(void)
visible = modeOnly = true; visible = modeOnly = true;
} }
timeoutShow = (modeOnly && !timeoutShow && Speed == -1 && Play) ? time(NULL) + MODETIMEOUT : 0; if (modeOnly && !timeoutShow && Speed == -1 && Play)
timeoutShow = time(NULL) + MODETIMEOUT;
const char *Mode; const char *Mode;
if (Speed == -1) Mode = Play ? " > " : " || "; if (Speed == -1) Mode = Play ? " > " : " || ";
else if (Play) Mode = Forward ? " X>> " : " <<X "; else if (Play) Mode = Forward ? " X>> " : " <<X ";