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

The CAM menu is now automatically closed when the current channel is switched

Browse Source
This commit is contained in:
Klaus Schmidinger 2017-12-04 15:33:41 +01:00
parent 0224fc5210
commit e5e0315d34
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3425,6 +3425,7 @@ Dietmar Spingler <d_spingler@gmx.de>
for suggesting to optionally list the channels with channel ids in the SVDRP command LSTC for suggesting to optionally list the channels with channel ids in the SVDRP command LSTC
for suggesting to include the channel ID in log messages about switching channels for suggesting to include the channel ID in log messages about switching channels
for reporting a problem with the SVDRP command CHAN while the channel display is open for reporting a problem with the SVDRP command CHAN while the channel display is open
for suggesting to automatically close the CAM menu when the current channel is switched
Stefan Schallenberg <infos@nafets.de> Stefan Schallenberg <infos@nafets.de>
for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement() for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()

2
HISTORY
View File

@ -9217,3 +9217,5 @@ Video Disk Recorder Revision History
different volumes (reported by Matthias Senzel). different volumes (reported by Matthias Senzel).
- Fixed positioning to the current item when changing the sort mode in the Recordings - Fixed positioning to the current item when changing the sort mode in the Recordings
menu, in case there is a LastReplayed recording. menu, in case there is a LastReplayed recording.
- The CAM menu is now automatically closed when the current channel is switched
(suggested by Dietmar Spingler).

6
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 4.47 2017/12/04 14:50:59 kls Exp $ * $Id: menu.c 4.48 2017/12/04 15:25:57 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -3798,6 +3798,7 @@ bool cMenuSetupCAMItem::Changed(void)
class cMenuSetupCAM : public cMenuSetupBase { class cMenuSetupCAM : public cMenuSetupBase {
private: private:
int currentChannel;
const char *activationHelp; const char *activationHelp;
eOSState Menu(void); eOSState Menu(void);
eOSState Reset(void); eOSState Reset(void);
@ -3810,6 +3811,7 @@ public:
cMenuSetupCAM::cMenuSetupCAM(void) cMenuSetupCAM::cMenuSetupCAM(void)
{ {
currentChannel = cDevice::CurrentChannel();
activationHelp = NULL; activationHelp = NULL;
SetMenuCategory(mcSetupCam); SetMenuCategory(mcSetupCam);
SetSection(tr("CAM")); SetSection(tr("CAM"));
@ -3935,6 +3937,8 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
} }
SetHelpKeys(); SetHelpKeys();
} }
if (currentChannel != cDevice::CurrentChannel())
state = osEnd;
return state; return state;
} }