Hi
* Klaus Schmidinger schrieb am 07.09.03, um 11:23 Uhr:
> Before I upload the official 1.2.5 release I would appreciate if some of
> you could find the time to look over this one in the VDR Developer directory.
I took some time, to look over this pre-release. I did not test the
vdr-pre-releases of vdr 1.2.3 and 1.2.4, so the following comments target
at changed from these versions too.
I am not verry happy with the changes regarding errors conf-files, and
missing conf-files.
One thing is that a diseqc.conf-file is required, even for users who
don't use DiSEqC. I created an empty diseqc.conf, and vdr works again
- i would say it is not verry usefull if this file is required.
I would suggest, that vdr checks, if DiSEqC == 1 in setup.conf, and
then requires diseqc.conf. (I made a small patch against vdr.c which
is attached.)
Another thing is that i am switching between vdr vanilla and vdr with
autopid-patch. Because of autopid i have the entry "Blue Director" in
my keymacros.conf. Now vanilla vdr does not start with this entry. I
would suggest that vdr ignores this entry, and only prints an Error in
the syslog. The second thing regarding keymacros.conf is the test for
entries like "Key @pluginname", where the plugin is not available - i
would say here too, that it would be enough to print an error in the
syslog and ignore this entry. (Another small patch regarding these
issues is attached.)
The third thing, i would suggest, is a small change in the
runvdr-script, to inform the user, if vdr exited with exit state 2.
Simply replace: if test $? -eq 0 -o $? -eq 2; then exit; fi
with:
case $? in
0)
exit
;;
2)
echo "An non-recoverable error has been detected, vdr has given up."
exit 2
;;
esac
Greetings from Erfurt
Thomas
--
Thomas Schmidt
:wq
--- vdr.c.orig 2003-09-12 12:33:57.000000000 +0200
+++ vdr.c 2003-09-12 12:11:39.000000000 +0200
@@ -346,7 +346,7 @@
Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
- Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) &&
+ (Setup.DiSEqC == 0 || Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true)) &&
Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&
--- keys.c.orig 2002-11-30 17:01:37.000000000 +0100
+++ keys.c 2003-09-12 12:38:49.000000000 +0200
@@ -212,7 +212,6 @@
plugin = strdup(p + 1);
if (!cPluginManager::GetPlugin(plugin)) {
esyslog("ERROR: unknown plugin '%s'", plugin);
- return false;
}
}
else {
@@ -224,7 +223,6 @@
macro[n] = cKey::FromString(p);
if (macro[n] == kNone) {
esyslog("ERROR: unknown key '%s'", p);
- return false;
}
}
n++;
Attachment:
pgp00000.pgp
Description: PGP signature