Moved the declaration of cMenuText to VDR/menu.h to make it available to plugins

This commit is contained in:
Klaus Schmidinger 2004-05-23 09:40:38 +02:00
parent d5533f2014
commit d10624fbca
4 changed files with 16 additions and 12 deletions

View File

@ -183,6 +183,8 @@ Stefan Huelswitt <huels@iname.com>
for changing thread handling to make it work with NPTL ("Native Posix Thread Library") for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
for creating mutexes with PTHREAD_MUTEX_ERRORCHECK_NP, which made the 'lockingTid' for creating mutexes with PTHREAD_MUTEX_ERRORCHECK_NP, which made the 'lockingTid'
stuff obsolete stuff obsolete
for suggesting to move the declaration of cMenuText to VDR/menu.h to make it
available to plugins
Ulrich Röder <roeder@efr-net.de> Ulrich Röder <roeder@efr-net.de>
for pointing out that there are channels that have a symbol rate higher than for pointing out that there are channels that have a symbol rate higher than

View File

@ -2805,7 +2805,7 @@ Video Disk Recorder Revision History
set the "Set system time" and "Use time from transponder" parameters accordingly set the "Set system time" and "Use time from transponder" parameters accordingly
(this is necessary even if you have already set them before!). (this is necessary even if you have already set them before!).
2004-05-22: Version 1.3.8 2004-05-23: Version 1.3.8
- Fixed a crash when switching the skin and having selected a non-default theme - Fixed a crash when switching the skin and having selected a non-default theme
that is not available for the newly selected skin (thanks to Sascha Volkenandt that is not available for the newly selected skin (thanks to Sascha Volkenandt
@ -2827,3 +2827,5 @@ Video Disk Recorder Revision History
'Transfer Mode' (thanks to Michal Dobrzynski for reporting this one). 'Transfer Mode' (thanks to Michal Dobrzynski for reporting this one).
- Fixed a memory leak in NIT processing (thanks to Marcel Wiesweg). - Fixed a memory leak in NIT processing (thanks to Marcel Wiesweg).
- Added a few missing initializations (thanks to Marcel Wiesweg). - Added a few missing initializations (thanks to Marcel Wiesweg).
- Moved the declaration of cMenuText to VDR/menu.h to make it available to plugins
(suggested by Stefan Huelswitt).

11
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.302 2004/05/22 13:23:22 kls Exp $ * $Id: menu.c 1.303 2004/05/23 09:39:09 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -499,15 +499,6 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
// --- cMenuText ------------------------------------------------------------- // --- cMenuText -------------------------------------------------------------
class cMenuText : public cOsdMenu {
private:
const char *text;
public:
cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
};
cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font) cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
:cOsdMenu(Title) :cOsdMenu(Title)
{ {

11
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.61 2004/04/30 13:45:19 kls Exp $ * $Id: menu.h 1.62 2004/05/23 09:39:02 kls Exp $
*/ */
#ifndef __MENU_H #ifndef __MENU_H
@ -19,6 +19,15 @@
#include "recording.h" #include "recording.h"
#include "skins.h" #include "skins.h"
class cMenuText : public cOsdMenu {
private:
const char *text;
public:
cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
};
class cMenuMain : public cOsdMenu { class cMenuMain : public cOsdMenu {
private: private:
time_t lastActivity; time_t lastActivity;