summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-06-10 11:53:39 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2017-06-10 11:53:39 +0200
commit360d8fe6b1faeea134f7a18d45ebbe69fd685be6 (patch)
treee8ebcdc420f2e40db0dfde43ea0ce9c3e44031f8 /vdr.c
parent93102b45e09ac75bb390aa58b0a94c63f0da0091 (diff)
downloadvdr-360d8fe6b1faeea134f7a18d45ebbe69fd685be6.tar.gz
vdr-360d8fe6b1faeea134f7a18d45ebbe69fd685be6.tar.bz2
Implemented CAM auto responses
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vdr.c b/vdr.c
index fe2a7297..d92c6297 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
- * $Id: vdr.c 4.17 2017/06/06 10:53:44 kls Exp $
+ * $Id: vdr.c 4.18 2017/06/10 11:53:39 kls Exp $
*/
#include <getopt.h>
@@ -763,6 +763,7 @@ int main(int argc, char *argv[])
Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
Folders.Load(AddDirectory(ConfigDirectory, "folders.conf"));
+ CamResponsesLoad(AddDirectory(ConfigDirectory, "camresponses.conf"), true);
if (!*cFont::GetFontFileName(Setup.FontOsd)) {
const char *msg = "no fonts available - OSD will not show any text!";