neutrino: introduce WEBRADIODIR and WEBRADIODIR_VAR

Origin commit data
------------------
Branch: ni/coolstream
Commit: b06fdf8b27
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-25 (Tue, 25 Sep 2018)

Origin message was:
------------------
- neutrino: introduce WEBRADIODIR and WEBRADIODIR_VAR

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-09-25 23:53:35 +02:00
parent ce4e754860
commit 933076a507
3 changed files with 13 additions and 2 deletions

View File

@@ -268,6 +268,12 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins, TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
[--with-luaplugindir=PATH], [where to find Lua plugins]) [--with-luaplugindir=PATH], [where to find Lua plugins])
TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
[--with-webradiodir=PATH], [where to find webradio content])
TUXBOX_APPS_DIRECTORY_ONE(webradiodir_var, WEBRADIODIR_VAR, localstatedir, /var, /tuxbox/webradio,
[--with-webradiodir_var=PATH], [where to find webradio content in /var])
TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv, TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv,
[--with-webtvdir=PATH], [where to find webtv content]) [--with-webtvdir=PATH], [where to find webtv content])
@@ -317,6 +323,8 @@ AC_SUBST(PLUGINDIR)
AC_SUBST(PLUGINDIR_VAR) AC_SUBST(PLUGINDIR_VAR)
AC_SUBST(PLUGINDIR_MNT) AC_SUBST(PLUGINDIR_MNT)
AC_SUBST(LUAPLUGINDIR) AC_SUBST(LUAPLUGINDIR)
AC_SUBST(WEBRADIODIR)
AC_SUBST(WEBRADIODIR_VAR)
AC_SUBST(WEBTVDIR) AC_SUBST(WEBTVDIR)
AC_SUBST(WEBTVDIR_VAR) AC_SUBST(WEBTVDIR_VAR)
AC_SUBST(LOCALEDIR) AC_SUBST(LOCALEDIR)

View File

@@ -2778,6 +2778,7 @@ TIMER_START();
CFileHelpers::createDir(LOCALEDIR_VAR); CFileHelpers::createDir(LOCALEDIR_VAR);
CFileHelpers::createDir(THEMESDIR_VAR); CFileHelpers::createDir(THEMESDIR_VAR);
CFileHelpers::createDir(PLUGINDIR_VAR); CFileHelpers::createDir(PLUGINDIR_VAR);
CFileHelpers::createDir(WEBRADIODIR_VAR);
CFileHelpers::createDir(WEBTVDIR_VAR); CFileHelpers::createDir(WEBTVDIR_VAR);
CFileHelpers::createDir(PUBLIC_HTTPDDIR); CFileHelpers::createDir(PUBLIC_HTTPDDIR);

View File

@@ -453,12 +453,14 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
if (ycmd_name.compare("CONFIGDIR")) yresult = CONFIGDIR; if (ycmd_name.compare("CONFIGDIR")) yresult = CONFIGDIR;
else if (ycmd_name.compare("DATADIR")) yresult = DATADIR; else if (ycmd_name.compare("DATADIR")) yresult = DATADIR;
else if (ycmd_name.compare("FONTDIR")) yresult = FONTDIR; else if (ycmd_name.compare("FONTDIR")) yresult = FONTDIR;
else if (ycmd_name.compare("FONTDIR_VAR")) yresult = FONTDIR_VAR; //NI else if (ycmd_name.compare("FONTDIR_VAR")) yresult = FONTDIR_VAR;
else if (ycmd_name.compare("LIBDIR")) yresult = LIBDIR; else if (ycmd_name.compare("LIBDIR")) yresult = LIBDIR;
else if (ycmd_name.compare("GAMESDIR")) yresult = GAMESDIR; else if (ycmd_name.compare("GAMESDIR")) yresult = GAMESDIR;
else if (ycmd_name.compare("PLUGINDIR")) yresult = PLUGINDIR; else if (ycmd_name.compare("PLUGINDIR")) yresult = PLUGINDIR;
else if (ycmd_name.compare("PLUGINDIR_VAR")) yresult = PLUGINDIR_VAR; else if (ycmd_name.compare("PLUGINDIR_VAR")) yresult = PLUGINDIR_VAR;
else if (ycmd_name.compare("WEBTVDIR")) yresult = WEBTVDIR; //NI else if (ycmd_name.compare("WEBRADIODIR")) yresult = WEBRADIODIR;
else if (ycmd_name.compare("WEBRADIODIR_VAR")) yresult = WEBRADIODIR_VAR;
else if (ycmd_name.compare("WEBTVDIR")) yresult = WEBTVDIR;
else if (ycmd_name.compare("WEBTVDIR_VAR")) yresult = WEBTVDIR_VAR; else if (ycmd_name.compare("WEBTVDIR_VAR")) yresult = WEBTVDIR_VAR;
else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR; else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR;
else if (ycmd_name.compare("LOCALEDIR")) yresult = LOCALEDIR; else if (ycmd_name.compare("LOCALEDIR")) yresult = LOCALEDIR;