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

Pressing 'Ok' while the mode display is on brings up the progress display

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-09-21 16:18:51 +02:00
parent a77360a1b6
commit d8aef25cbc
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -768,4 +768,5 @@ Video Disk Recorder Revision History
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); fixed timeout when pressing '0' to set an editing mark while (Skip +/-60s); fixed timeout when pressing '0' to set an editing mark while
the progress display is not shown; mode display is shown after progress the progress display is not shown; mode display is shown after progress
display is closed; display is closed; pressing "Ok" while the mode display is on brings up
the progress display;

10
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.123 2001/09/21 16:03:48 kls Exp $ * $Id: menu.c 1.124 2001/09/21 16:16:47 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2386,6 +2386,8 @@ void cReplayControl::ClearLastReplayed(const char *FileName)
void cReplayControl::Show(int Seconds) void cReplayControl::Show(int Seconds)
{ {
if (modeOnly)
Hide();
if (!visible) { if (!visible) {
shown = ShowProgress(true); shown = ShowProgress(true);
timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0; timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0;
@ -2725,7 +2727,11 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
switch (Key) { switch (Key) {
// Menu control: // Menu control:
case kMenu: Hide(); return osMenu; // allow direct switching to menu case kMenu: Hide(); return osMenu; // allow direct switching to menu
case kOk: visible ? Hide() : Show(); break; case kOk: if (visible && !modeOnly)
Hide();
else
Show();
break;
case kBack: return osRecordings; case kBack: return osRecordings;
default: return osUnknown; default: return osUnknown;
} }