From 9ef312f888aae6167bf210d0d1bb8fcb9b787584 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 15 Oct 2006 18:00:00 +0200
Subject: Version 1.4.3-2 - Fixed clearing an event's Title, ShortText and
 Description in case the data comes   from an external source. - Updated the
 Hungarian language texts (thanks to Guido Josten). - Fixed a possible crash
 if cPluginManager::GetPlugin() is called with a NULL   pointer (thanks to
 Petri Hintukainen). - Fixed displaying the error log message in case an
 unknown plugin was requested   in a key macro (thanks to Petri Hintukainen).
 - Keys from expanded key macros are now put into the front of the key queue
 to   avoid problems if the queue is not empty at that time (based on a patch
 from   Petri Hintukainen). - cKeyMacro now has an explicit counter for the
 number of keys it contains. - cRemote::PutMacro() now sets a lock while it
 expands the macro (thanks to   Petri Hintukainen). - Fixed handling plugins
 from cRemote::PutMacro() and cRemote::CallPlugin()   (based on a patch from
 Petri Hintukainen). - Increased the size of the key queue to avoid problems
 with long key macros.

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

(limited to 'keys.h')

diff --git a/keys.h b/keys.h
index 4fa1337..be87c79 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.9 2006/04/15 13:56:03 kls Exp $
+ * $Id: keys.h 1.10 2006/10/14 10:41:20 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -117,11 +117,16 @@ extern cKeys Keys;
 class cKeyMacro : public cListObject {
 private:
   eKeys macro[MAXKEYSINMACRO];
+  int numKeys;
   char *plugin;
 public:
   cKeyMacro(void);
   ~cKeyMacro();
   bool Parse(char *s);
+  int NumKeys(void) const { return numKeys; }
+      ///< Returns the number of keys in this macro. The first key (with
+      ///< index 0) is the macro code. The actual macro expansion codes
+      ///< start at index 1 and go to NumKeys() - 1.
   const eKeys *Macro(void) const { return macro; }
   const char *Plugin(void) const { return plugin; }
   };
-- 
cgit v1.2.3