kAudio closes temporary OSD displays

This commit is contained in:
Klaus Schmidinger 2005-01-06 14:36:40 +01:00
parent b387538887
commit 723537ccc8
2 changed files with 9 additions and 2 deletions

3
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.66 2005/01/02 14:38:00 kls Exp $
* $Id: menu.h 1.67 2005/01/06 14:29:46 kls Exp $
*/
#ifndef __MENU_H
@ -87,6 +87,7 @@ private:
cDisplayTracks(void);
public:
virtual ~cDisplayTracks();
static bool IsOpen(void) { return currentDisplayTracks != NULL; }
static cDisplayTracks *Create(void);
static void Process(eKeys Key);
eOSState ProcessKey(eKeys Key);

8
vdr.c
View File

@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
* $Id: vdr.c 1.197 2005/01/02 14:39:41 kls Exp $
* $Id: vdr.c 1.198 2005/01/06 14:36:40 kls Exp $
*/
#include <getopt.h>
@ -699,6 +699,12 @@ int main(int argc, char *argv[])
break;
// Audio track control:
case kAudio:
if (cControl::Control())
cControl::Control()->Hide();
if (Temp && !cDisplayTracks::IsOpen()) {
DELETENULL(Menu);
Temp = NULL;
}
if (!Menu && !cOsd::IsOpen())
Menu = Temp = cDisplayTracks::Create();
else