From 2b15337b71d71c5e486efe738a507b550bb28843 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Dec 2002 18:00:00 +0100
Subject: Version 1.1.19 - The character '|' in description texts of EPG
 records is now interpreted as a   newline character (suggested by Gerhard
 Steiner). - Updated 'channels.conf.cable' (thanks to Andreas Kool). -
 Improved handling of repeated remote keys. - The RCU now only sets the
 channel number display when there are no incoming remote   control keys,
 which improves reaction on repeated keys. - The actual tuning is now done in
 a separate thread, which makes zapping through the   channels a lot faster
 and no longer gets stuck on channels that don't broadcast.   This also makes
 "Motor-DiSEqC" work (thanks to Reinhard Walter Buchner for his help   in
 testing this). Since switching channels now no longer explicitly waits for a 
  channel lock in the foreground thread, the "panic level" mechanism is no
 longer   used (maybe we don't need it any more, anyway). - The keyboard is
 now by default always active to control VDR. The 'make' option   REMOTE=KBD
 is therefore obsolete. When compiling VDR with REMOTE=RCU or REMOTE=LIRC,  
 the keyboard can thus now be active together with the remote control. If you
 want   to build VDR _without_ keyboard support you can set NO_KBD=1 in the
 'make' call.   Since the keyboard codes are now different from the ones used
 previously (which   were mapped by the 'ncurses' library) you will need to go
 through the "Learning   keys" procedure again. To do so, either delete the
 file /video/remote.conf or   remove the KBD.* entries from it before starting
 this version of VDR.   (Thanks to Thomas Sailer for pointing out how to set
 the terminal parameters to   read from the keyboard). - The 'ncurses' library
 is now only necessary when compiling VDR with DEBUG_OSD=1.

---
 vdr.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'vdr.c')

diff --git a/vdr.c b/vdr.c
index 438f98f..8f22f11 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,13 +22,14 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.136 2002/12/01 10:44:48 kls Exp $
+ * $Id: vdr.c 1.137 2002/12/08 13:34:39 kls Exp $
  */
 
 #include <getopt.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <termios.h>
 #include <unistd.h>
 #include "audio.h"
 #include "channels.h"
@@ -77,6 +78,11 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
+  // Save terminal settings:
+
+  struct termios savedTm;
+  tcgetattr(STDIN_FILENO, &savedTm);
+
   // Initiate locale:
 
   setlocale(LC_ALL, "");
@@ -294,7 +300,7 @@ int main(int argc, char *argv[])
   // Daemon mode:
 
   if (DaemonMode) {
-#if !defined(DEBUG_OSD) && !defined(REMOTE_KBD)
+#if !defined(DEBUG_OSD)
      pid_t pid = fork();
      if (pid < 0) {
         fprintf(stderr, "%m\n");
@@ -307,7 +313,7 @@ int main(int argc, char *argv[])
      fclose(stdout);
      fclose(stderr);
 #else
-     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD or REMOTE_KBD on!\n");
+     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD on!\n");
      return 2;
 #endif
      }
@@ -378,8 +384,10 @@ int main(int argc, char *argv[])
   new cRcuRemote("/dev/ttyS1");
 #elif defined(REMOTE_LIRC)
   new cLircRemote("/dev/lircd");
-#elif defined(REMOTE_KBD)
-  new cKbdRemote;
+#endif
+#if defined(REMOTE_KBD)
+  if (!DaemonMode)
+     new cKbdRemote;
 #endif
   Interface->LearnKeys();
 
@@ -716,6 +724,7 @@ int main(int argc, char *argv[])
   isyslog("exiting");
   if (SysLogLevel > 0)
      closelog();
+  tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
   if (cThread::EmergencyExit()) {
      esyslog("emergency exit!");
      return 1;
-- 
cgit v1.2.3