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

Merge branch 'master' into dvbsi++

Browse Source 
Conflicts:
	src/zapit/include/zapit/zapit.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86dbdde70d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-12 (Thu, 12 Apr 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2012-04-13 04:55:55 +08:00
parent a74f3b66d0 b9f549c9f3
commit 6abfd0c1f2
17 changed files with 156 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -34,6 +34,8 @@
#include <cs_api.h>
#include <global.h>
#include "gui/plugins.h"//for relodplugins
#include <neutrino.h>
#include <driver/screenshot.h>
// yhttpd
#include "yhttpd.h"
#include "ytypes_globals.h"
@@ -175,6 +177,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
{"version", &CControlAPI::VersionCGI, ""},
{"reloadsetup", &CControlAPI::ReloadNutrinoSetupfCGI, ""},
{"reloadplugins", &CControlAPI::ReloadPluginsCGI, ""},
{"screenshot", &CControlAPI::ScreenshotCGI, ""},
// boxcontrol - devices
{"volume", &CControlAPI::VolumeCGI, "text/plain"},
{"lcd", &CControlAPI::LCDAction, "text/plain"},
@@ -440,11 +443,9 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh)
hh->SendError();
}
else
#if HAVE_DBOX2 // FIXME: not implemented
if(NeutrinoAPI->Controld->getVideoPowerDown())
if(CNeutrinoApp::getInstance()->getMode() == 4)//mode_standby = 4
hh->WriteLn("on");
else
#endif
hh->WriteLn("off");
}
@@ -732,7 +733,9 @@ static const struct key keynames[] = {
{"KEY_PAUSE", KEY_PAUSE},
{"KEY_RECORD", KEY_RECORD},
{"KEY_STOP", KEY_STOP},
{"KEY_PLAY", KEY_PLAY}
{"KEY_PLAY", KEY_PLAY},
{"KEY_WWW", KEY_WWW},
{"KEY_GAMES", KEY_GAMES}
};
// The code here is based on rcsim. Thx Carjay!
@@ -1448,6 +1451,13 @@ void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
hh->SendOk();
}
void CControlAPI::ScreenshotCGI(CyhookHandler *hh)
{
CScreenShot * sc = new CScreenShot("/tmp/screenshot.png", (CScreenShot::screenshot_format_t)0 /*PNG*/);
sc->EnableOSD(true);
sc->Start();
hh->SendOk();
}
//-----------------------------------------------------------------------------
void CControlAPI::ZaptoCGI(CyhookHandler *hh)