diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 69d24bc8..d3921311 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -183,6 +183,8 @@ Stefan Huelswitt 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' stuff obsolete + for suggesting to move the declaration of cMenuText to VDR/menu.h to make it + available to plugins Ulrich Röder for pointing out that there are channels that have a symbol rate higher than diff --git a/HISTORY b/HISTORY index 2ba10479..7c0b73da 100644 --- a/HISTORY +++ b/HISTORY @@ -2805,7 +2805,7 @@ Video Disk Recorder Revision History set the "Set system time" and "Use time from transponder" parameters accordingly (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 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). - Fixed a memory leak in NIT processing (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). diff --git a/menu.c b/menu.c index f3b2eb1c..3c86c193 100644 --- a/menu.c +++ b/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.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" @@ -499,15 +499,6 @@ eOSState cMenuChannels::ProcessKey(eKeys Key) // --- 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) :cOsdMenu(Title) { diff --git a/menu.h b/menu.h index d52f6419..64bd0f95 100644 --- a/menu.h +++ b/menu.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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 @@ -19,6 +19,15 @@ #include "recording.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 { private: time_t lastActivity;