diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | vdr.c | 9 |
4 files changed, 9 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 228cf793..d794d0be 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1028,6 +1028,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi> the subtitles plugin for implementing cDevice::CloseFilter() for some fixes to PLUGINS.html + for fixing handling CONFDIR Ralf Klueber <ralf.klueber@vodafone.com> for reporting a bug in cutting a recording if there is only a single editing mark @@ -5505,3 +5505,4 @@ Video Disk Recorder Revision History - Added a workaround for recovering from wrongfully interpreted "pre 1.3.19 PS1 packets". - Fixed a possible blocking in replay when subtitles are active. - Fixed displaying subtitles in live mode. +- Fixed handling CONFDIR (thanks to Rolf Ahrenberg). @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.108 2007/10/13 09:26:40 kls Exp $ +# $Id: Makefile 1.109 2007/11/03 14:46:29 kls Exp $ .DELETE_ON_ERROR: @@ -27,7 +27,7 @@ PLUGINDIR= ./PLUGINS PLUGINLIBDIR= $(PLUGINDIR)/lib VIDEODIR = /video -CONFDIR ?= $(VIDEODIR) +CONFDIR = $(VIDEODIR) DOXYGEN = /usr/bin/doxygen DOXYFILE = Doxyfile @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.301 2007/10/19 14:44:19 kls Exp $ + * $Id: vdr.c 1.302 2007/11/03 14:46:29 kls Exp $ */ #include <getopt.h> @@ -181,6 +181,7 @@ int main(int argc, char *argv[]) #define DEFAULTSVDRPPORT 2001 #define DEFAULTWATCHDOG 0 // seconds +#define DEFAULTCONFDIR CONFDIR #define DEFAULTPLUGINDIR PLUGINDIR #define DEFAULTEPGDATAFILENAME "epg.data" @@ -382,8 +383,7 @@ int main(int argc, char *argv[]) if (DisplayHelp) { printf("Usage: vdr [OPTIONS]\n\n" // for easier orientation, this is column 80| " -a CMD, --audio=CMD send Dolby Digital audio to stdin of command CMD\n" - " -c DIR, --config=DIR read config files from DIR (default is to read them\n" - " from the video directory)\n" + " -c DIR, --config=DIR read config files from DIR (default: %s)\n" " -d, --daemon run in daemon mode\n" " -D NUM, --device=NUM use only the given DVB device (NUM = 0, 1, 2...)\n" " there may be several -D options (default: all DVB\n" @@ -425,6 +425,7 @@ int main(int argc, char *argv[]) " -w SEC, --watchdog=SEC activate the watchdog timer with a timeout of SEC\n" " seconds (default: %d); '0' disables the watchdog\n" "\n", + DEFAULTCONFDIR, DEFAULTEPGDATAFILENAME, DEFAULTPLUGINDIR, LIRC_DEVICE, @@ -537,7 +538,7 @@ int main(int argc, char *argv[]) // Configuration data: if (!ConfigDirectory) - ConfigDirectory = CONFDIR; + ConfigDirectory = DEFAULTCONFDIR; cPlugin::SetConfigDirectory(ConfigDirectory); cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes")); |