Displaying '-' when directly switching channels; increased timeout for direct channel switching

3 files changed, 8 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index 06b21fec..51cf7e4d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -544,3 +544,7 @@ Video Disk Recorder Revision History
 - No longer sending a Diseqc command if the Diseqc value for a given channel
   is '0'. Previously this caused problems with some multi-switches (thanks to
   Markus Lang and Ulrich Röder).
+- When switching channels by entering the channel number via the numeric keys
+  on the remote control, the channel number displayed is now followed by the
+  '-' character to indicate that additional digits can be entered.
+- Increased the timeout for numeric channel switching from 500ms to 1s.
diff --git a/MANUAL b/MANUAL
index 8d605526..4d5a5768 100644
--- a/MANUAL
+++ b/MANUAL
@@ -100,7 +100,7 @@ Video Disk Recorder User's Manual
      and browse through the list with the "Up" and "Down" key; to switch to the
      selected channel press "Ok".
   3. Directly type in the channel number with the numeric keys ('0'..'9');
-     if no key is pressed for about half a second, the digits collected so
+     if no key is pressed for about one second, the digits collected so
      far will define the channel number.
   4. From the "Now", "Next" and "Event" menus (accessible through the "Schedule"
      menu) by pressing the "Blue" button.
diff --git a/menu.c b/menu.c
index 2e014126..4dd7d445 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.75 2001/06/23 13:38:54 kls Exp $
+ * $Id: menu.c 1.76 2001/07/12 14:16:43 kls Exp $
  */
 
 #include "menu.h"
@@ -1789,7 +1789,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 
 // --- cDisplayChannel -------------------------------------------------------
 
-#define DIRECTCHANNELTIMEOUT  500 //ms
+#define DIRECTCHANNELTIMEOUT 1000 //ms
 #define INFOTIMEOUT          5000 //ms
 
 cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
@@ -1832,7 +1832,7 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
   int BufSize = Width() + 1;
   char buffer[BufSize];
   if (Channel && Channel->number)
-     snprintf(buffer, BufSize, "%d  %s", Channel->number, Channel->name);
+     snprintf(buffer, BufSize, "%d%s  %s", Channel->number, number ? "-" : "", Channel->name);
   else
      snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
   Interface->Fill(0, 0, MenuColumns, 1, clrBackground);