summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-02-06 10:18:20 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2010-02-06 10:18:20 +0100
commit4bf5c793f4dc4e106eb98100988ac543f7d7970c (patch)
tree704a501c2ab41399e2dc4f18af2f4aa6991fc76d
parent19e256d792a59cfe9117bfe009db402159fc30c1 (diff)
downloadvdr-4bf5c793f4dc4e106eb98100988ac543f7d7970c.tar.gz
vdr-4bf5c793f4dc4e106eb98100988ac543f7d7970c.tar.bz2
Moved the declaration of cMenuCommands to menu.h, so that plugins can use it
-rw-r--r--HISTORY3
-rw-r--r--menu.c18
-rw-r--r--menu.h18
3 files changed, 20 insertions, 19 deletions
diff --git a/HISTORY b/HISTORY
index bf27af97..9a0044c1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6309,8 +6309,9 @@ Video Disk Recorder Revision History
- The files "commands.conf" and "reccmd.conf" can now contain nested lists of
commands. See vdr.5 for information about the new file format.
-2010-02-05: Version 1.7.13
+2010-02-06: Version 1.7.13
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Changed the position of Sirius 4 to S4.8E in sources.conf (thanks to Alexander Gross).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Moved the declaration of cMenuCommands to menu.h, so that plugins can use it.
diff --git a/menu.c b/menu.c
index 7ddf0cff..9e97cb25 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 2.14 2010/01/31 12:43:24 kls Exp $
+ * $Id: menu.c 2.15 2010/02/06 10:16:15 kls Exp $
*/
#include "menu.h"
@@ -1781,22 +1781,6 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
// --- cMenuCommands ---------------------------------------------------------
-class cMenuCommands : public cOsdMenu {
-private:
- cList<cNestedItem> *commands;
- cString parameters;
- cString title;
- cString command;
- bool confirm;
- char *result;
- bool Parse(const char *s);
- eOSState Execute(void);
-public:
- cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters = NULL);
- virtual ~cMenuCommands();
- virtual eOSState ProcessKey(eKeys Key);
- };
-
cMenuCommands::cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters)
:cOsdMenu(Title)
{
diff --git a/menu.h b/menu.h
index d428a8dd..39de82d8 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 2.1 2010/01/17 11:21:42 kls Exp $
+ * $Id: menu.h 2.2 2010/02/06 10:17:24 kls Exp $
*/
#ifndef __MENU_H
@@ -53,6 +53,22 @@ public:
virtual eOSState ProcessKey(eKeys Key);
};
+class cMenuCommands : public cOsdMenu {
+private:
+ cList<cNestedItem> *commands;
+ cString parameters;
+ cString title;
+ cString command;
+ bool confirm;
+ char *result;
+ bool Parse(const char *s);
+ eOSState Execute(void);
+public:
+ cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters = NULL);
+ virtual ~cMenuCommands();
+ virtual eOSState ProcessKey(eKeys Key);
+ };
+
class cMenuEditTimer : public cOsdMenu {
private:
cTimer *timer;