From 33c8ad925a13169e35636f79fca9423ee56b55e4 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 15 Feb 2003 15:46:19 +0100 Subject: [PATCH] Improved keyboard detection --- CONTRIBUTORS | 1 + HISTORY | 1 + vdr.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 7bc76b99..c10172fa 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -217,6 +217,7 @@ Werner Fink contains Dolby Digital data for improving thread locking in the ring buffer to avoid possible race conditions under heavy load + for improving keyboard detection Rolf Hakenes for providing 'libdtv' and adapting the EIT mechanisms to it diff --git a/HISTORY b/HISTORY index 2c5b4c59..9d466908 100644 --- a/HISTORY +++ b/HISTORY @@ -1965,3 +1965,4 @@ Video Disk Recorder Revision History - Now polling the output device in 'Transfer Mode' and retrying to put packets into the ring buffer. - Resetting the CAM slot in case communication breaks down. +- Improved keyboard detection (thanks to Werner Fink). diff --git a/vdr.c b/vdr.c index dfaf5dcb..49371064 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/people/kls/vdr * - * $Id: vdr.c 1.143 2003/02/09 13:13:42 kls Exp $ + * $Id: vdr.c 1.144 2003/02/15 15:36:01 kls Exp $ */ #include @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) // Save terminal settings: struct termios savedTm; - bool HasStdin = tcgetpgrp(STDIN_FILENO) == getpid() && tcgetattr(STDIN_FILENO, &savedTm) == 0; + bool HasStdin = (tcgetpgrp(STDIN_FILENO) == getpid() || getppid() != (pid_t)1) && tcgetattr(STDIN_FILENO, &savedTm) == 0; // Initiate locale: