const char *MyConfigDir = cPlugin::ConfigDirectory();
diff -ruN vdr-1.7.27/plugin.c vdr-1.7.27.patched//plugin.c
--- vdr-1.7.27/plugin.c 2012-03-11 14:56:02.000000000 +0100
+++ vdr-1.7.27.patched//plugin.c 2012-04-06 09:43:38.595832504 +0200
@@ -26,6 +26,8 @@
// --- cPlugin ---------------------------------------------------------------
char *cPlugin::configDirectory = NULL;
+char *cPlugin::cacheDirectory = NULL;
+char *cPlugin::resourceDirectory = NULL;
cPlugin::cPlugin(void)
{
@@ -145,6 +147,36 @@
return MakeDirs(buffer, true) ? *buffer : NULL;
}
+void cPlugin::SetCacheDirectory(const char *Dir)
+{
+ free(cacheDirectory);
+ cacheDirectory = strdup(Dir);
+}
+
+const char *cPlugin::CacheDirectory(const char *PluginName)
+{
+ static cString buffer;
+ if (!cThread::IsMainThread())
+ esyslog("ERROR: plugin '%s' called cPlugin::CacheDirectory(), which is not thread safe!", PluginName ? PluginName : "");
+ buffer = cString::sprintf("%s/plugins%s%s", cacheDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+ return MakeDirs(buffer, true) ? *buffer : NULL;
+}
+
+void cPlugin::SetResourceDirectory(const char *Dir)
+{
+ free(resourceDirectory);
+ resourceDirectory = strdup(Dir);
+}
+
+const char *cPlugin::ResourceDirectory(const char *PluginName)
+{
+ static cString buffer;
+ if (!cThread::IsMainThread())
+ esyslog("ERROR: plugin '%s' called cPlugin::ResourceDirectory(), which is not thread safe!", PluginName ? PluginName : "");
+ buffer = cString::sprintf("%s/plugins%s%s", resourceDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+ return MakeDirs(buffer, true) ? *buffer : NULL;
+}
+
// --- cDll ------------------------------------------------------------------
cDll::cDll(const char *FileName, const char *Args)
diff -ruN vdr-1.7.27/plugin.h vdr-1.7.27.patched//plugin.h
--- vdr-1.7.27/plugin.h 2012-03-11 14:55:56.000000000 +0100
+++ vdr-1.7.27.patched//plugin.h 2012-04-06 09:43:38.596832504 +0200
@@ -22,6 +22,8 @@
friend class cPluginManager;
private:
static char *configDirectory;
+ static char *cacheDirectory;
+ static char *resourceDirectory;
const char *name;
bool started;
void SetName(const char *s);
@@ -57,6 +59,12 @@
static void SetConfigDirectory(const char *Dir);
static const char *ConfigDirectory(const char *PluginName = NULL);
+
+ static void SetCacheDirectory(const char *Dir);
+ static const char *CacheDirectory(const char *PluginName = NULL);
+
+ static void SetResourceDirectory(const char *Dir);
+ static const char *ResourceDirectory(const char *PluginName = NULL);
};
class cDll : public cListObject {
diff -ruN vdr-1.7.27/vdr.1 vdr-1.7.27.patched//vdr.1
--- vdr-1.7.27/vdr.1 2012-02-27 12:01:17.000000000 +0100
+++ vdr-1.7.27.patched//vdr.1 2012-04-06 09:43:38.596832504 +0200
@@ -42,6 +42,9 @@
.BI \-a\ cmd ,\ \-\-audio= cmd
Send Dolby Digital audio to stdin of command \fIcmd\fR.
.TP
+.BI \-\-cachedir= dir
+save cache files in \fIdir\fR.
+.TP
.BI \-c\ dir ,\ \-\-config= dir
Read config files from directory \fIdir\fR
(default is to read them from the video directory).
@@ -157,6 +160,9 @@
Call \fIcmd\fR before and after a recording. See the file \fIINSTALL\fR for
more information.
.TP
+.BI \-\-resdir= dir
+read resource files from \fIdir\fR.
+.TP
.BI \-s\ cmd ,\ \-\-shutdown= cmd
Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
information.
diff -ruN vdr-1.7.27/vdr.c vdr-1.7.27.patched//vdr.c
--- vdr-1.7.27/vdr.c 2012-03-14 10:09:19.000000000 +0100
+++ vdr-1.7.27.patched//vdr.c 2012-04-06 09:45:15.546832504 +0200
@@ -181,15 +181,19 @@
#define DEFAULTWATCHDOG 0 // seconds
#define DEFAULTCONFDIR CONFDIR
#define DEFAULTPLUGINDIR PLUGINDIR
+#define DEFAULTCACHEDIR CACHEDIR
#define DEFAULTEPGDATAFILENAME "epg.data"
+#define DEFAULTRESDIR RESDIR
bool StartedAsRoot = false;
const char *VdrUser = NULL;
bool UserDump = false;
int SVDRPport = DEFAULTSVDRPPORT;
const char *AudioCommand = NULL;
+ const char *CacheDirectory = NULL;
const char *ConfigDirectory = NULL;
const char *EpgDataFileName = DEFAULTEPGDATAFILENAME;
+ const char *ResourceDirectory = NULL;
bool DisplayHelp = false;
bool DisplayVersion = false;
bool DaemonMode = false;
@@ -215,6 +219,7 @@
static struct option long_options[] = {
{ "audio", required_argument, NULL, 'a' },
+ { "cachedir", required_argument, NULL, 'c' | 0x100 },
{ "config", required_argument, NULL, 'c' },
{ "daemon", no_argument, NULL, 'd' },
{ "device", required_argument, NULL, 'D' },
@@ -234,6 +239,7 @@
{ "plugin", required_argument, NULL, 'P' },
{ "port", required_argument, NULL, 'p' },
{ "record", required_argument, NULL, 'r' },
+ { "resdir", required_argument, NULL, 'r' | 0x200 },
{ "shutdown", required_argument, NULL, 's' },
{ "split", no_argument, NULL, 's' | 0x100 },
{ "terminal", required_argument, NULL, 't' },
@@ -251,6 +257,9 @@
switch (c) {
case 'a': AudioCommand = optarg;
break;
+ case 'c' | 0x100:
+ CacheDirectory = optarg;
+ break;
case 'c': ConfigDirectory = optarg;
break;
case 'd': DaemonMode = true; break;
@@ -348,6 +357,9 @@
break;
case 'r': cRecordingUserCommand::SetCommand(optarg);
break;
+ case 'r' | 0x200:
+ ResourceDirectory = optarg;
+ break;
case 's': ShutdownHandler.SetShutdownCommand(optarg);
break;
case 's' | 0x100:
@@ -413,6 +425,7 @@
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"
+ " --cachedir=DIR save cache files in DIR (default: %s)\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"
@@ -449,6 +462,7 @@
" 0 turns off SVDRP\n"
" -P OPT, --plugin=OPT load a plugin defined by the given options\n"
" -r CMD, --record=CMD call CMD before and after a recording\n"
+ " --resdir=DIR read resource files from DIR (default: %s)\n"
" -s CMD, --shutdown=CMD call CMD to shutdown the computer\n"
" --split split edited files at the editing marks (only\n"
" useful in conjunction with --edit)\n"
@@ -463,6 +477,7 @@
" -w SEC, --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
" seconds (default: %d); '0' disables the watchdog\n"
"\n",
+ DEFAULTCACHEDIR,
DEFAULTCONFDIR,
DEFAULTEPGDATAFILENAME,
MAXVIDEOFILESIZEDEFAULT,
@@ -470,6 +485,7 @@
LIRC_DEVICE,
LOCDIR,
DEFAULTSVDRPPORT,
+ DEFAULTRESDIR,
VideoDirectory,
DEFAULTWATCHDOG
);
@@ -577,14 +593,33 @@
if (!PluginManager.LoadPlugins(true))
EXIT(2);
- // Configuration data:
+ // Configuration directory:
if (!ConfigDirectory)
ConfigDirectory = DEFAULTCONFDIR;
cPlugin::SetConfigDirectory(ConfigDirectory);
+
+ // Cache directory:
+
+ if (!CacheDirectory)
+ CacheDirectory = DEFAULTCACHEDIR;
+
+ cPlugin::SetCacheDirectory(CacheDirectory);
+
+ // Resource directory:
+
+ if (!ResourceDirectory)
+ ResourceDirectory = DEFAULTRESDIR;
+
+ cPlugin::SetResourceDirectory(ResourceDirectory);
+
+ // Themes directory:
+
cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
+ // Configuration data:
+
Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true);
Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC);
@@ -618,7 +653,7 @@
EpgDataFileName = DEFAULTEPGDATAFILENAME;
}
else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
- EpgDirectory = VideoDirectory;
+ EpgDirectory = CacheDirectory;
if (EpgDirectory)
cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
else |