From 96ebdbf4b1e495d44f8f837068af7c2d925bab62 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 1 Dec 2002 18:00:00 +0100
Subject: Version 1.1.18 - Fixed missing initialization of 'number' in cChannel
 (thanks to Martin Hammerschmid   for reporting this one). - Fixed a misplaced
 ')' in the fix about the stale lock files (thanks again to   Oliver Endriss
 for pointing this out - it was my fault). - Group delimiters in the
 'channels.conf' file that have no text (like a simple ":"   or ":@201") no
 longer show up in the Channels menu (suggested by Guy Roussin). - Added "Tele
 5" to 'channels.conf' (thanks to Georg Hitsch). - Changed the source
 directory name for plugins from 'SRC' to 'src' (suggested by   Clemens
 Kirchgatterer). - Removed transponders 10788, 11739 and 12266 from
 'channels.conf' (apparently they   are no longer active). - Deactivated some
 templates in tools.h in case some plugin needs to use the STL   (suggested by
 Gerald Berwolf). - Timers now accept channel IDs even if the 'source' is 0
 (thanks to Stefan Huelswitt   for reporting this one). - Now taking an active
 SVDRP connection into account when doing shutdown or   housekeeping
 (suggested by Emil Naepflein). - Macros in 'keymacros.conf' can now use
 "@plugin" to directly access the main menu   function of a given plugin (see
 man vdr(5) for details). - The new plugin 'sky' can be used to integrate a
 Sky Digibox into the VDR system,   using a Kfir MPEG2 encoder card (see
 PLUGINS/src/sky/README for details).

---
 keys.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'keys.h')

diff --git a/keys.h b/keys.h
index ceb2d1c..02c513a 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.3 2002/10/27 15:18:21 kls Exp $
+ * $Id: keys.h 1.4 2002/12/01 10:43:26 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -46,6 +46,8 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kCommands,
              kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9,
              kNone,
+             // The following codes are used internally:
+             k_Plugin,
              k_Setup,
              // The following flags are OR'd with the above codes:
              k_Repeat  = 0x8000,
@@ -105,10 +107,13 @@ extern cKeys Keys;
 class cKeyMacro : public cListObject {
 private:
   eKeys macro[MAXKEYSINMACRO];
+  char *plugin;
 public:
   cKeyMacro(void);
+  ~cKeyMacro();
   bool Parse(char *s);
   const eKeys *Macro(void) const { return macro; }
+  const char *Plugin(void) const { return plugin; }
   };
 
 class cKeyMacros : public cConfig<cKeyMacro> {
-- 
cgit v1.2.3