frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

The menu timeout now also works when pressing the 'Back' button during replay to enter the 'Recordings' menu

Browse Source
This commit is contained in:
Klaus Schmidinger
2001-10-20 11:23:27 +02:00
parent 60ee85bf17
commit e3c09115fe
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@@ -822,3 +822,5 @@ Video Disk Recorder Revision History
- Fixed a bug in the replay mode display when pressing the Green or Yellow
button while in trick mode (thanks to Stefan Huelswitt)
- Closing all open file descriptors when calling external programs.
- The menu timeout now also works when pressing the "Back" button during replay
to enter the "Recordings" menu.

11
menu.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 1.129 2001/10/20 09:04:28 kls Exp $
* $Id: menu.c 1.130 2001/10/20 11:16:56 kls Exp $
*/
#include "menu.h"
@@ -1808,7 +1808,7 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
#define STOP_RECORDING tr(" Stop recording ")
cMenuMain::cMenuMain(bool Replaying)
cMenuMain::cMenuMain(bool Replaying, eOSState State)
:cOsdMenu(tr("Main"))
{
digit = 0;
@@ -1844,6 +1844,13 @@ cMenuMain::cMenuMain(bool Replaying)
Display();
lastActivity = time(NULL);
SetHasHotkeys();
switch (State) {
case osRecordings: AddSubMenu(new cMenuRecordings); break;
#ifdef DVDSUPPORT
case osDVD: AddSubMenu(new cMenuDVD); break;
#endif //DVDSUPPORT
default: break;
}
}
const char *cMenuMain::hk(const char *s)

4
menu.h
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.h 1.31 2001/10/07 15:13:26 kls Exp $
* $Id: menu.h 1.32 2001/10/20 11:15:26 kls Exp $
*/
#ifndef _MENU_H
@@ -23,7 +23,7 @@ private:
int digit;
const char *hk(const char *s);
public:
cMenuMain(bool Replaying);
cMenuMain(bool Replaying, eOSState State = osUnknown);
virtual eOSState ProcessKey(eKeys Key);
};

6
vdr.c
View File

@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
* $Id: vdr.c 1.85 2001/10/20 10:26:54 kls Exp $
* $Id: vdr.c 1.86 2001/10/20 11:18:38 kls Exp $
*/
#include <getopt.h>
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
case osRecordings:
DELETENULL(Menu);
DELETENULL(ReplayControl);
Menu = new cMenuRecordings;
Menu = new cMenuMain(ReplayControl, osRecordings);
break;
case osReplay: DELETENULL(Menu);
DELETENULL(ReplayControl);
@@ -417,7 +417,7 @@ int main(int argc, char *argv[])
#ifdef DVDSUPPORT
case osDVD: DELETENULL(Menu);
DELETENULL(ReplayControl);
Menu = new cMenuDVD;
Menu = new cMenuMain(ReplayControl, osDVD);
break;
#endif //DVDSUPPORT
case osStopReplay: