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

Fixed initializing the RCU code

This commit is contained in:
Klaus Schmidinger 2000-10-29 14:00:00 +01:00
parent e6999e9b3a
commit 10741c4c54
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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.39 2000/10/08 14:49:25 kls Exp $ * $Id: vdr.c 1.40 2000/10/29 14:00:00 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -161,10 +161,6 @@ int main(int argc, char *argv[])
if (!cDvbApi::Init()) if (!cDvbApi::Init())
abort(); abort();
// User interface:
Interface = new cInterface(SVDRPport);
// Configuration data: // Configuration data:
if (!ConfigDirectory) if (!ConfigDirectory)
@ -176,14 +172,21 @@ int main(int argc, char *argv[])
#ifdef REMOTE_LIRC #ifdef REMOTE_LIRC
Keys.SetDummyValues(); Keys.SetDummyValues();
#else #else
if (!Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF))) bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
Interface->LearnKeys();
#endif #endif
cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB); cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
Channels.SwitchTo(CurrentChannel); Channels.SwitchTo(CurrentChannel);
// User interface:
Interface = new cInterface(SVDRPport);
#ifndef REMOTE_LIRC
if (!KeysLoaded)
Interface->LearnKeys();
#endif
// Signal handlers: // Signal handlers:
if (signal(SIGHUP, SignalHandler) == SIG_IGN) signal(SIGHUP, SIG_IGN); if (signal(SIGHUP, SignalHandler) == SIG_IGN) signal(SIGHUP, SIG_IGN);