The files "commands.conf" and "reccmd.conf" can now contain nested lists of commands1.7.12

1 files changed, 3 insertions, 20 deletions

diff --git a/config.h b/config.h
index 37e11a41..be1d7bde 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.20 2010/01/17 15:08:32 kls Exp $
+ * $Id: config.h 2.21 2010/01/31 11:14:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -48,21 +48,6 @@
 #define MaxSkinName 16
 #define MaxThemeName 16
 
-class cCommand : public cListObject {
-private:
-  char *title;
-  char *command;
-  bool confirm;
-  static char *result;
-public:
-  cCommand(void);
-  virtual ~cCommand();
-  bool Parse(const char *s);
-  const char *Title(void) { return title; }
-  bool Confirm(void) { return confirm; }
-  const char *Execute(const char *Parameters = NULL);
-  };
-
 typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
 
 class cSVDRPhost : public cListObject {
@@ -187,8 +172,6 @@ public:
   bool Save(void);
   };
 
-class cCommands : public cConfig<cCommand> {};
-
 class cSVDRPhosts : public cConfig<cSVDRPhost> {
 public:
   bool LocalhostOnly(void);
@@ -196,8 +179,8 @@ public:
   };
 
 extern cNestedItemList Folders;
-extern cCommands Commands;
-extern cCommands RecordingCommands;
+extern cNestedItemList Commands;
+extern cNestedItemList RecordingCommands;
 extern cSVDRPhosts SVDRPhosts;
 
 class cSetupLine : public cListObject {