Version 0.64vdr-0.64

- NOTE: If you are using DVB driver version 0.7 you need to load the dvb.o
  module with option outstream=0, so your insmod statement should read
  'insmod dvb.o outstream=0'. This is currently necessary because 'vdr'
  still works with AV_PES data.
- Video files now have the 'group read' bit set.
- Fixed handling errors in 'readstring()'.
- Handling SIGPIPE and re-establishing handler after intercepting a signal.
- The configuration files are now by default read from the video directory.
  This can be changed by using the new '-c' option. Make sure you copy your
  current '*.conf' files to your video directory ('/video' by default), or
  use "-c ." to get the old behaviour of loading the configuration files
  from the current directory.
- Waiting for input is now handled by a common function, which improves
  response time on user actions. As a consequence the EIT data may sometimes
  not be displayed, but this will change later when cEIT runs as a separate
  thread.
- The new SVDRP command 'HITK' (thanks to Guido Fiala!) can be used to 'hit'
  a remote control key.  Establish an SVDRP connection and enter HITK without
  a parameter for a list of all valid key names.
- The new SVDRP command 'GRAB' (thanks to Guido Fiala!) can be used to grab
  the current frame and save it to a file.
- The new SVDRP commands 'OVL*' can be used to control video overlays (thanks
  to Guido Fiala!). This is mainly for use in the 'kvdr' tool (see the 'kvdr'
  page at http://www.s.netic.de/gfiala).
- If the name of the video directory used with the '-v' option had trailing
  slashes, the recording file names have been damaged. Trailing slashes are
  now silently removed.
- Fixed a buffer overflow in EIT parsing.
- Added a security warning regarding SVDRP to the INSTALL file.
- Fixed 'confirm' dialog.
- The daemon mode (option '-d') now no longer works with REMOTE=KBD (there
  is no stdin in daemon mode, so KBD makes no sense - plus it sometimes
  crashed).

1 files changed, 21 insertions, 14 deletions

diff --git a/interface.c b/interface.c
index 5633f86..3d01238 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.15 2000/09/10 16:04:14 kls Exp $
+ * $Id: interface.c 1.19 2000/09/19 17:41:23 kls Exp $
  */
 
 #include "interface.h"
@@ -29,11 +29,19 @@ cInterface::cInterface(void)
   open = 0;
   cols[0] = 0;
   keyFromWait = kNone;
+  SVDRP = NULL;
 }
 
-void cInterface::Init(void)
+void cInterface::Init(int SVDRPport)
 {
   RcIo.SetCode(Keys.code, Keys.address);
+  if (SVDRPport)
+     SVDRP = new cSVDRP(SVDRPport);
+}
+
+void cInterface::Cleanup(void)
+{
+  delete SVDRP;
 }
 
 void cInterface::Open(int NumCols, int NumLines)
@@ -52,10 +60,6 @@ void cInterface::Close(void)
 
 unsigned int cInterface::GetCh(bool Wait)
 {
-#ifdef DEBUG_OSD
-  timeout(0);
-  getch(); // just to make 'ncurses' display the window:
-#endif
   if (RcIo.InputAvailable(Wait)) {
      unsigned int Command;
      return RcIo.GetCommand(&Command, NULL) ? Command : 0;
@@ -65,21 +69,24 @@ unsigned int cInterface::GetCh(bool Wait)
 
 eKeys cInterface::GetKey(bool Wait)
 {
+  if (SVDRP)
+     SVDRP->Process();
   eKeys Key = keyFromWait != kNone ? keyFromWait : Keys.Get(GetCh(Wait));
   keyFromWait = kNone;
   return Key;
 }
 
+void cInterface::PutKey(eKeys Key)
+{
+  keyFromWait = Key;
+}
+
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
-  int t0 = time_ms() + Seconds * 1000;
   eKeys Key = kNone;
-
-  while (time_ms() < t0) {
-        Key = GetKey();
-        if (Key != kNone)
-           break;
-        }
+  RcIo.Flush(500);
+  if (cFile::AnyFileReady(-1, Seconds * 1000))
+     Key = GetKey();
   if (KeepChar)
      keyFromWait = Key;
   return Key;
@@ -227,7 +234,7 @@ void cInterface::QueryKeys(void)
          Keys.address = Address;
          WriteText(1, 5, "RC code detected!");
          WriteText(1, 6, "Do not press any key...");
-         RcIo.Flush(3);
+         RcIo.Flush(3000);
          ClearEol(0, 5);
          ClearEol(0, 6);
          break;