Version 0.05vdr-0.05

- Support for more than one DVB card.
- Simultaneous record and replay (with two DVB cards).
- Instant recordings no longer get the name "instant". They now get the name
  of the channel, with a prepended '@' character.
- Timers that are not given an explicit Name now use the channel name with
  a prepended '@' character.
- If an instant recording is currently active, the Main menu now contains
  an option to stop that recording.
- Timers are now only processed when the Menu is not active. So after editing
  a timer the effect will take place only after the menu has been closed.
  In order to avoid missing a timer event by inadvertently leaving the menu
  open, the menu will be closed automatically after about two minutes of
  inactivity.
- If a recording is currently being replayed, the Main menu now contains an
  option to stop replaying.
- Displaying the recording DVB interface status in the decimal points of the
  RCU display.
- Reduced the number of remote control keys. Modified the key assignments for
  the PC keyboard to better resemble the "up-down-left-right-ok" layout on
  menu controlling remote control units.

1 files changed, 6 insertions, 12 deletions

diff --git a/config.h b/config.h
index 42af0f8..1e22b88 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 1.4 2000/04/24 09:44:17 kls Exp $
+ * $Id: config.h 1.6 2000/05/27 14:43:46 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include "dvbapi.h"
 #include "tools.h"
 
 #define MaxBuffer 1000
@@ -26,19 +27,11 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kBack,
              kLeft,
              kRight,
-             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
              kRed,
              kGreen,
              kYellow,
              kBlue,
-             kRecord,
-             kPause,
-             kStop,
-             kBegin,
-             kSearchForward,
-             kSearchBack,
-             kSkipForward,
-             kSkipBack,
+             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
              kNone
            };
 
@@ -79,8 +72,9 @@ public:
   cChannel(const cChannel *Channel);
   bool Parse(char *s);
   bool Save(FILE *f);
-  bool Switch(void);
-  static bool SwitchTo(int i);
+  bool Switch(cDvbApi *DvbApi = NULL);
+  static bool SwitchTo(int i, cDvbApi *DvbApi = NULL);
+  static const char *GetChannelName(int i);
   };
 
 class cTimer : public cListObject {