summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2000-07-15 12:39:20 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2000-07-15 12:39:20 +0200
commit20019e7ce51b9e14ce28f96b263b76e6becd4184 (patch)
tree183c0f3bac333786eb71f6825ce40412b8cb7ab4 /vdr.c
parent5c574ffb7bba34506479247bf6d924e090bc2d10 (diff)
downloadvdr-0.0.6.tar.gz
vdr-0.0.6.tar.bz2
Added support for LIRC remote control0.0.6
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index bcda4711..4c1dce0a 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.19 2000/05/27 15:38:35 kls Exp $
+ * $Id: vdr.c 1.20 2000/07/15 11:45:05 kls Exp $
*/
#include <signal.h>
@@ -33,7 +33,7 @@
#include "recording.h"
#include "tools.h"
-#ifdef DEBUG_REMOTE
+#ifdef REMOTE_KBD
#define KEYS_CONF "keys-pc.conf"
#else
#define KEYS_CONF "keys.conf"
@@ -58,8 +58,10 @@ int main(int argc, char *argv[])
Channels.Load("channels.conf");
Timers.Load("timers.conf");
+#ifndef REMOTE_LIRC
if (!Keys.Load(KEYS_CONF))
Interface.LearnKeys();
+#endif
Interface.Init();
cChannel::SwitchTo(CurrentChannel);