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

Added the usual menu timeout to the CAM menus

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-08-03 09:54:18 +02:00
parent ba1c9fb534
commit f8386cdd8b
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -2254,7 +2254,7 @@ Video Disk Recorder Revision History
- Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf - Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf
Ahrenberg). Ahrenberg).
2003-07-26: Version 1.2.2 2003-08-03: Version 1.2.2
- Fixed a bug in channel switching after Left/Right has been pressed (thanks to - Fixed a bug in channel switching after Left/Right has been pressed (thanks to
Michael Walle for reporting this one). Michael Walle for reporting this one).
@ -2281,3 +2281,4 @@ Video Disk Recorder Revision History
with VFAT=1 (thanks to Ernst Fürst for reporting this one). with VFAT=1 (thanks to Ernst Fürst for reporting this one).
- Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile - Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile
or Makefile.config as defaults (thanks to Steffen Barszus). or Makefile.config as defaults (thanks to Steffen Barszus).
- Added the usual menu timeout to the CAM menus.

12
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.263 2003/08/02 13:23:58 kls Exp $ * $Id: menu.c 1.264 2003/08/03 09:38:37 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1562,6 +1562,7 @@ cMenuCam::cMenuCam(cCiMenu *CiMenu)
Add(new cOsdItem(ciMenu->BottomText())); Add(new cOsdItem(ciMenu->BottomText()));
Display(); Display();
dsyslog("CAM: Menu - %s", ciMenu->TitleText()); dsyslog("CAM: Menu - %s", ciMenu->TitleText());
lastActivity = time(NULL);
} }
cMenuCam::~cMenuCam() cMenuCam::~cMenuCam()
@ -1590,6 +1591,10 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
default: break; default: break;
} }
} }
if (Key != kNone)
lastActivity = time(NULL);
else if (time(NULL) - lastActivity > MENUTIMEOUT)
state = osEnd;
return state; return state;
} }
@ -1607,6 +1612,7 @@ cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM"); SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
Add(new cMenuEditNumItem("Input", input, Length, ciEnquiry->Blind())); Add(new cMenuEditNumItem("Input", input, Length, ciEnquiry->Blind()));
Display(); Display();
lastActivity = time(NULL);
} }
cMenuCamEnquiry::~cMenuCamEnquiry() cMenuCamEnquiry::~cMenuCamEnquiry()
@ -1635,6 +1641,10 @@ eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
default: break; default: break;
} }
} }
if (Key != kNone)
lastActivity = time(NULL);
else if (time(NULL) - lastActivity > MENUTIMEOUT)
state = osEnd;
return state; return state;
} }

4
menu.h
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.h 1.56 2003/05/24 16:35:52 kls Exp $ * $Id: menu.h 1.57 2003/08/03 09:37:18 kls Exp $
*/ */
#ifndef __MENU_H #ifndef __MENU_H
@ -62,6 +62,7 @@ public:
class cMenuCam : public cOsdMenu { class cMenuCam : public cOsdMenu {
private: private:
cCiMenu *ciMenu; cCiMenu *ciMenu;
time_t lastActivity;
bool selected; bool selected;
eOSState Select(void); eOSState Select(void);
public: public:
@ -73,6 +74,7 @@ public:
class cMenuCamEnquiry : public cOsdMenu { class cMenuCamEnquiry : public cOsdMenu {
private: private:
cCiEnquiry *ciEnquiry; cCiEnquiry *ciEnquiry;
time_t lastActivity;
char *input; char *input;
bool replied; bool replied;
eOSState Reply(void); eOSState Reply(void);