frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling of REMOTE=NONE

This commit is contained in:
Klaus Schmidinger 2001-02-04 19:41:24 +01:00
parent bb03fa2a0c
commit 484a3afa89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/people/kls/vdr * The project's page is at http://www.cadsoft.de/people/kls/vdr
* *
* $Id: vdr.c 1.51 2001/02/04 11:51:11 kls Exp $ * $Id: vdr.c 1.52 2001/02/04 19:41:24 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -180,9 +180,9 @@ int main(int argc, char *argv[])
Channels.Load(AddDirectory(ConfigDirectory, "channels.conf")); Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")); Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf")); Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
#ifdef REMOTE_LIRC #if defined(REMOTE_LIRC)
Keys.SetDummyValues(); Keys.SetDummyValues();
#else #elif !defined(REMOTE_NONE)
bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF)); bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
#endif #endif
@ -200,7 +200,7 @@ int main(int argc, char *argv[])
// User interface: // User interface:
Interface = new cInterface(SVDRPport); Interface = new cInterface(SVDRPport);
#ifndef REMOTE_LIRC #if !defined(REMOTE_LIRC) && !defined(REMOTE_NONE)
if (!KeysLoaded) if (!KeysLoaded)
Interface->LearnKeys(); Interface->LearnKeys();
#endif #endif