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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 01add923d6 6e38f7b956
commit bc33663742
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,9 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
{"reloadsetup", &CControlAPI::ReloadNeutrinoSetupCGI, ""},
{"reloadplugins", &CControlAPI::ReloadPluginsCGI, ""},
{"reloadchannels", &CControlAPI::ReloadChannelsCGI, ""},
#ifdef SCREENSHOT
{"screenshot", &CControlAPI::ScreenshotCGI, ""},
#endif
// boxcontrol - devices
{"volume", &CControlAPI::VolumeCGI, "text/plain"},
{"lcd", &CControlAPI::LCDAction, "text/plain"},
@@ -847,6 +849,7 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
if (!hh->ParamList["repeat"].empty())
repeat = atoi(hh->ParamList["repeat"].c_str());
#endif
#if 0
int evd = open(EVENTDEV, O_RDWR);
if (evd < 0) {
hh->SendError();
@@ -866,6 +869,9 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
return;
}
close(evd);
#endif
/* 0 == KEY_PRESSED in rcinput.cpp */
g_RCInput->postMsg((neutrino_msg_t) sendcode, 0);
hh->SendOk();
}
//-----------------------------------------------------------------------------
@@ -1890,7 +1896,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
else if (!hh->ParamList["eventid"].empty()) {
//special epg query
uint64_t epgid = 0;
sscanf(hh->ParamList["eventid"].c_str(), "%llu", &epgid);
sscanf(hh->ParamList["eventid"].c_str(), "%" SCNu64 "", &epgid);
CShortEPGData epg;
if (CEitManager::getInstance()->getEPGidShort(epgid, &epg)) {
hh->WriteLn(epg.title);
@@ -1902,7 +1908,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
if (!hh->ParamList["starttime"].empty()) {
uint64_t epgid = 0;
time_t starttime = 0;
sscanf(hh->ParamList["fskid"].c_str(), "%llu", &epgid);
sscanf(hh->ParamList["fskid"].c_str(), "%" SCNu64 "", &epgid);
sscanf(hh->ParamList["starttime"].c_str(), "%lu", &starttime);
CEPGData longepg;
if (CEitManager::getInstance()->getEPGid(epgid, starttime, &longepg)) {
@@ -1964,6 +1970,7 @@ void CControlAPI::ReloadChannelsCGI(CyhookHandler *hh)
hh->SendOk();
}
#ifdef SCREENSHOT
void CControlAPI::ScreenshotCGI(CyhookHandler *hh)
{
bool enableOSD = true;
@@ -1990,6 +1997,7 @@ void CControlAPI::ScreenshotCGI(CyhookHandler *hh)
hh->SendError();
#endif
}
#endif
//-----------------------------------------------------------------------------
void CControlAPI::ZaptoCGI(CyhookHandler *hh)