mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

make the webtv directory configurable

Browse Source
This commit is contained in:
GetAway
2017-02-07 08:39:09 +01:00
committed by svenhoefer
parent 622e7a4dd2
commit a62d5b7c8e
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acinclude.m4
View File

@@ -155,6 +155,9 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
[--with-plugindir_var=PATH ],[where to find the plugins in /var])
TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv,
[--with-webtvdir_var=PATH ],[where to find the livestreamScriptPath in /var])
TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
[--with-plugindir_mnt=PATH ],[where to find the the extern plugins])

2
src/neutrino.cpp
View File

@@ -939,7 +939,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.infoClockSeconds = configfile.getInt32("infoClockSeconds", 1);
g_settings.livestreamResolution = configfile.getInt32("livestreamResolution", 1920);
g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", PLUGINDIR_VAR "/webtv");
g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", WEBTVDIR_VAR);
g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");

1
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -457,6 +457,7 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
else if (ycmd_name.compare("GAMESDIR")) yresult = GAMESDIR;
else if (ycmd_name.compare("PLUGINDIR")) yresult = PLUGINDIR;
else if (ycmd_name.compare("PLUGINDIR_VAR")) yresult = PLUGINDIR_VAR;
else if (ycmd_name.compare("WEBTVDIR_VAR")) yresult = WEBTVDIR_VAR;
else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR;
else if (ycmd_name.compare("LOCALEDIR")) yresult = LOCALEDIR;
else if (ycmd_name.compare("LOCALEDIR_VAR")) yresult = LOCALEDIR_VAR;