Merge branch 'dvbsi++' into next

This commit is contained in:
[CST] Focus
2013-02-13 15:34:41 +04:00
24 changed files with 347 additions and 167 deletions

View File

@@ -1463,10 +1463,23 @@ void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
void CControlAPI::ScreenshotCGI(CyhookHandler *hh)
{
CScreenShot * sc = new CScreenShot("/tmp/screenshot.png", (CScreenShot::screenshot_format_t)0 /*PNG*/);
sc->EnableOSD(true);
bool enableOSD = true;
bool enableVideo = true;
std::string filename = "screenshot";
if(hh->ParamList["osd"] == "0")
enableOSD = false;
if(hh->ParamList["video"] == "0")
enableVideo = false;
if(hh->ParamList["name"] != "")
filename = hh->ParamList["name"];
CScreenShot * sc = new CScreenShot("/tmp/" + filename + ".png", (CScreenShot::screenshot_format_t)0 /*PNG*/);
sc->EnableOSD(enableOSD);
sc->EnableVideo(enableVideo);
sc->Start();
hh->SendOk();
hh->SendOk(); // FIXME what if sc->Start() failed?
}
//-----------------------------------------------------------------------------