Version 1.1.21vdr-1.1.21

- Fixed the 'channels.conf' entries for "Studio Universal" and "Disney Channel".
- Fixed handling channels in the "Channels" menu in case there are ':@nnn' group
  separators without names (thanks to Guy Roussin for reporting this one).
- The SVDRP command CHAN now also accepts channel IDs.
- Increased the timeout until an index file is considerd no longer to be written
  (sometimes in time shift with heavy system load the index file was closed too
  early by the replay thread).
- Implemented "Link Layer" based CAM support, which hopefully will solve the
  problems with CAMs we had in the past. To use this you need the driver version
  2002-01-08 or higher (with the new firmware supporting the "Link Layer" protocol).
- Added an EPG bugfix that moves the Subtitle data to the Extended Description in
  case the latter is empty and the Subtitle exceeds some useful length.
- Since several channels put very long strings into the Subtitle part of their
  EPG data, that string is now limited in length when used in a recording's
  file name.

1 files changed, 26 insertions, 1 deletions

diff --git a/menu.h b/menu.h
index 7e7e4d6..e886f18 100644
--- a/menu.h
+++ b/menu.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.51 2002/11/30 15:55:39 kls Exp $
+ * $Id: menu.h 1.52 2003/01/06 10:04:05 kls Exp $
  */
 
 #ifndef __MENU_H
 #define __MENU_H
 
+#include "ci.h"
 #include "device.h"
 #include "osd.h"
 #include "dvbplayer.h"
@@ -58,6 +59,30 @@ public:
   eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuCam : public cOsdMenu {
+private:
+  cCiMenu *ciMenu;
+  bool selected;
+  eOSState Select(void);
+public:
+  cMenuCam(cCiMenu *CiMenu);
+  virtual ~cMenuCam();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuCamEnquiry : public cOsdMenu {
+private:
+  cCiEnquiry *ciEnquiry;
+  bool replied;
+  eOSState Reply(void);
+public:
+  cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
+  virtual ~cMenuCamEnquiry();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cOsdObject *CamControl(void);
+
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {