mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

NI \o/

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -56,6 +56,11 @@ extern CPictureViewer *g_PicViewer;
extern cVideo * videoDecoder;
//NI
#include <system/helpers.h>
#include "gui/infoicons.h"
extern CInfoIcons *InfoIcons; /* neutrino.cpp */
extern CPlugins *g_PluginList;//for relodplugins
extern CBouquetManager *g_bouquetManager;
#define EVENTDEV "/dev/input/input0"
@@ -226,7 +231,9 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
{"file", &CControlAPI::FileCGI, "+xml"},
{"statfs", &CControlAPI::StatfsCGI, "+xml"},
{"getdir", &CControlAPI::getDirCGI, "+xml"},
{"getmovies", &CControlAPI::getMoviesCGI, "+xml"}
{"getmovies", &CControlAPI::getMoviesCGI, "+xml"},
//NI
{"infoicons", &CControlAPI::InfoIconsCGI, "text/plain"}
};
//-----------------------------------------------------------------------------
// Main Dispatcher
@@ -2075,6 +2082,12 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh)
else
hh->SendError();
}
else if (hh->ParamList["subchannel"] != "")
{
NeutrinoAPI->ZapToSubService(hh->ParamList["subchannel"].c_str());
hh->SendOk();
}
else
{
NeutrinoAPI->ZapTo(hh->ParamList["1"].c_str());
@@ -3559,7 +3572,6 @@ std::string CControlAPI::getSubdirectories(CyhookHandler *hh, std::string path,
return result;
}
//-----------------------------------------------------------------------------
/** Get neutrino movies
*
@@ -3676,3 +3688,75 @@ std::string CControlAPI::readMovies(CyhookHandler *hh, std::string path, std::st
}
return result;
}
//NI
//-----------------------------------------------------------------------------
void CControlAPI::InfoIconsCGI(CyhookHandler *hh)
{
std::string result = "unknown";
if (hh->ParamList.empty() || hh->ParamList["1"] == "status")
{
if (g_settings.mode_icons)
{
if (g_settings.mode_icons_skin == INFOICONS_STATIC)
result = "static";
else if (g_settings.mode_icons_skin == INFOICONS_POPUP)
result = "popup";
}
else
{
if (g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
result = "infoviewer";
else
result = "off";
}
return hh->WriteLn(result);
}
int remember_mode_icons = g_settings.mode_icons;
if (hh->ParamList["1"] == "static")
{
g_settings.mode_icons=1;
g_settings.mode_icons_skin=INFOICONS_STATIC;
}
else if (hh->ParamList["1"] == "popup")
{
g_settings.mode_icons=1;
g_settings.mode_icons_skin=INFOICONS_POPUP;
}
else if (hh->ParamList["1"] == "infoviewer")
{
g_settings.mode_icons=0;
g_settings.mode_icons_skin=INFOICONS_INFOVIEWER;
}
else if (hh->ParamList["1"] == "off")
{
g_settings.mode_icons=0;
if (g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
g_settings.mode_icons_skin=INFOICONS_STATIC;
}
else
{
hh->SendError();
return;
}
CConfigFile *Config = new CConfigFile(',');
Config->loadConfig(NEUTRINO_CONFIGFILE);
Config->setInt32("mode_icons", g_settings.mode_icons);
Config->setInt32("mode_icons_skin", g_settings.mode_icons_skin);
Config->saveConfig(NEUTRINO_CONFIGFILE);
delete Config;
if (g_settings.mode_icons != remember_mode_icons)
{
if (remember_mode_icons)
InfoIcons->enableInfoIcons(false);
else
InfoIcons->enableInfoIcons(true);
}
hh->SendOk();
}