mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
The CAM menu now automatically updates itself in case of a progress display
This commit is contained in:
parent
8302d81af2
commit
2fc075f5f9
2
HISTORY
2
HISTORY
@ -3871,3 +3871,5 @@ Video Disk Recorder Revision History
|
||||
- Improved displaying 'sub-title' and 'bottom text' in the CAM menu.
|
||||
- Added status message "Resetting CAM..." for an immediate feedback when the CAM
|
||||
reset has been triggered.
|
||||
- The CAM menu now automatically updates itself in case of a progress display (as
|
||||
used, for instance, when updating the firmware via satellite).
|
||||
|
7
ci.c
7
ci.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: ci.c 1.28 2005/09/17 11:43:08 kls Exp $
|
||||
* $Id: ci.c 1.29 2005/10/02 12:51:42 kls Exp $
|
||||
*/
|
||||
|
||||
#include "ci.h"
|
||||
@ -1229,6 +1229,11 @@ bool cCiMenu::AddEntry(char *s)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool cCiMenu::HasUpdate(void)
|
||||
{
|
||||
return mmi->HasUserIO();
|
||||
}
|
||||
|
||||
bool cCiMenu::Select(int Index)
|
||||
{
|
||||
cMutexLock MutexLock(&mutex);
|
||||
|
3
ci.h
3
ci.h
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: ci.h 1.14 2005/08/20 14:56:11 kls Exp $
|
||||
* $Id: ci.h 1.15 2005/10/02 12:51:22 kls Exp $
|
||||
*/
|
||||
|
||||
#ifndef __CI_H
|
||||
@ -40,6 +40,7 @@ public:
|
||||
bool Selectable(void) { return selectable; }
|
||||
bool Select(int Index);
|
||||
bool Cancel(void);
|
||||
bool HasUpdate(void);
|
||||
};
|
||||
|
||||
class cCiEnquiry {
|
||||
|
6
menu.c
6
menu.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: menu.c 1.366 2005/10/02 10:08:57 kls Exp $
|
||||
* $Id: menu.c 1.367 2005/10/02 12:56:19 kls Exp $
|
||||
*/
|
||||
|
||||
#include "menu.h"
|
||||
@ -1338,6 +1338,10 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
if (ciMenu->HasUpdate()) {
|
||||
selected = true; // just to not call ciMenu->Cancel()
|
||||
return osEnd;
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user