From 81d121e2d574e405f74ae7aeed82774d1af40c14 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 11 Feb 2016 21:59:24 +0100 Subject: [PATCH] controlapi: allow to get moviebrowser.conf with config call Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/809a7dcb452ddc8e7ed5751d862ec996e3f6119c Author: vanhofen Date: 2016-02-11 (Thu, 11 Feb 2016) Origin message was: ------------------ - controlapi: allow to get moviebrowser.conf with config call ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 2 ++ src/nhttpd/yconfig.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 69cee2499..b238efa63 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -2956,6 +2956,8 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) { // Para "config" describes the config type if (configFileName == "neutrino") config_filename = NEUTRINO_CONFIGFILE; + else if (configFileName == "moviebrowser") + config_filename = MOVIEBROWSER_CONFIGFILE; else if (configFileName == "nhttpd") config_filename = HTTPD_CONFIGFILE; else if (configFileName == "yweb") diff --git a/src/nhttpd/yconfig.h b/src/nhttpd/yconfig.h index 0006e345d..5aa76f112 100644 --- a/src/nhttpd/yconfig.h +++ b/src/nhttpd/yconfig.h @@ -110,6 +110,7 @@ #define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf" #define PUBLICDOCUMENTROOT PUBLIC_HTTPDDIR #define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf" +#define MOVIEBROWSER_CONFIGFILE CONFIGDIR"/moviebrowser.conf" #define HOSTEDDOCUMENTROOT HOSTED_HTTPDDIR #define HOSTEDDOCUMENTURL "/hosted/" #define EXTRASDOCUMENTROOT HOSTED_HTTPDDIR"/extras"