mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Reading setup.conf before initializing DVB devices (didn't set system time)
This commit is contained in:
parent
dd610898ef
commit
88253cfba7
12
vdr.c
12
vdr.c
@ -22,7 +22,7 @@
|
||||
*
|
||||
* The project's page is at http://www.cadsoft.de/people/kls/vdr
|
||||
*
|
||||
* $Id: vdr.c 1.41 2000/11/01 14:31:32 kls Exp $
|
||||
* $Id: vdr.c 1.42 2000/11/03 15:31:03 kls Exp $
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
@ -156,11 +156,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
|
||||
|
||||
// DVB interfaces:
|
||||
|
||||
if (!cDvbApi::Init())
|
||||
abort();
|
||||
|
||||
// Configuration data:
|
||||
|
||||
if (!ConfigDirectory)
|
||||
@ -175,6 +170,11 @@ int main(int argc, char *argv[])
|
||||
bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
|
||||
#endif
|
||||
|
||||
// DVB interfaces:
|
||||
|
||||
if (!cDvbApi::Init())
|
||||
abort();
|
||||
|
||||
cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
|
||||
|
||||
Channels.SwitchTo(CurrentChannel);
|
||||
|
Loading…
Reference in New Issue
Block a user