frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-09-14 09:38:44 +02:00
parent ac4393b866
commit 07bc699dca
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -747,6 +747,7 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
for reporting a crash when cancelling a newly created timer for reporting a crash when cancelling a newly created timer
for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated
Michael Walle <michael.walle@web.de> Michael Walle <michael.walle@web.de>
for reporting a bug in channel switching after Left/Right has been pressed for reporting a bug in channel switching after Left/Right has been pressed

4
HISTORY
View File

@ -2376,7 +2376,7 @@ Video Disk Recorder Revision History
is active (sometimes the CAMs got irritated when the device tuned to channels is active (sometimes the CAMs got irritated when the device tuned to channels
they couldn't handle). they couldn't handle).
2003-09-09: Version 1.2.5 2003-09-14: Version 1.2.5
- Fixed dropping out of replay mode while viewing a recording that is still - Fixed dropping out of replay mode while viewing a recording that is still
going on (thanks to Oliver Endriss for reporting and helping to debug this going on (thanks to Oliver Endriss for reporting and helping to debug this
@ -2387,3 +2387,5 @@ Video Disk Recorder Revision History
- Removed the obsolete chapter "Stopping a recording on the primary DVB interface" - Removed the obsolete chapter "Stopping a recording on the primary DVB interface"
from MANUAL. from MANUAL.
- Completed Dutch language texts (thanks to Hans Dingemans). - Completed Dutch language texts (thanks to Hans Dingemans).
- Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated (thanks to
Thomas Schmidt).

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $ * $Id: vdr.c 1.169 2003/09/14 09:36:54 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -346,7 +346,7 @@ int main(int argc, char *argv[])
Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")); Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) && if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) && Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC) &&
Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) && Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) && Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) && Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&