Added status message "Opening CAM menu... for an immediate feedback when the CAM menu has been requested; speeded up initial opening of the CAM menu

3 files changed, 33 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index b31c7d4d..5af67eb2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3878,3 +3878,6 @@ Video Disk Recorder Revision History
   a sub menu.
 - Reduced MAX_CONNECT_RETRIES in ci.c to 2 (waiting too long made the whole thing
   appear hanging).
+- Added status message "Opening CAM menu..." for an immediate feedback when the CAM
+  menu has been requested.
+- Speeded up initial opening of the CAM menu.
diff --git a/i18n.c b/i18n.c
index bf7fb48e..55ec647a 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.211 2005/10/02 10:17:41 kls Exp $
+ * $Id: i18n.c 1.212 2005/10/02 14:36:11 kls Exp $
  *
  * Translations provided by:
  *
@@ -2273,6 +2273,27 @@ const tI18nPhrase Phrases[] = {
     "Kõvaketas peaaegu täis!",
     "Kun lidt diskplads tilbage!",
   },
+  { "Opening CAM menu...",
+    "CAM-Menü wird geöffnet...",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Can't open CAM menu!",
     "CAM-Menü kann nicht geöffnet werden!",
     "Ne morem odpreti CAM menija!",
diff --git a/menu.c b/menu.c
index 7f32283c..a3cbda6d 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.368 2005/10/02 13:20:41 kls Exp $
+ * $Id: menu.c 1.369 2005/10/02 14:38:27 kls Exp $
  */
 
 #include "menu.h"
@@ -34,6 +34,7 @@
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
+#define MAXWAITFORCAMMENU 4 // seconds to wait for the CAM menu to open
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
@@ -2179,8 +2180,13 @@ eOSState cMenuSetupCICAM::Menu(void)
 {
   cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
   if (item) {
-     if (item->CiHandler()->EnterMenu(item->Slot()))
+     if (item->CiHandler()->EnterMenu(item->Slot())) {
+        Skins.Message(mtWarning, tr("Opening CAM menu..."));
+        time_t t = time(NULL);
+        while (time(NULL) - t < MAXWAITFORCAMMENU && !item->CiHandler()->HasUserIO())
+              item->CiHandler()->Process();
         return osEnd; // the CAM menu will be executed explicitly from the main loop
+        }
      else
         Skins.Message(mtError, tr("Can't open CAM menu!"));
      }