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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-18 21:53:44 +02:00
parent 672ad153a3 570ba4305b
commit 83be9c1fe3
29 changed files with 50 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2098,18 +2098,21 @@ void CControlAPI::ScreenshotCGI(CyhookHandler *hh)
if(!hh->ParamList["name"].empty())
filename = hh->ParamList["name"];
CScreenShot * sc = new CScreenShot("/tmp/" + filename + ".png", (CScreenShot::screenshot_format_t)0 /*PNG*/);
sc->EnableOSD(enableOSD);
sc->EnableVideo(enableVideo);
CScreenShot * screenshot = new CScreenShot("/tmp/" + filename + ".png", (CScreenShot::screenshot_format_t)0 /*PNG*/);
if(screenshot){
screenshot->EnableOSD(enableOSD);
screenshot->EnableVideo(enableVideo);
#if 0
sc->Start();
hh->SendOk(); // FIXME what if sc->Start() failed?
screenshot->Start();
hh->SendOk(); // FIXME what if screenshot->Start() failed?
#else
if (sc->StartSync())
hh->SendOk();
else
hh->SendError();
if (screenshot->StartSync())
hh->SendOk();
else
hh->SendError();
#endif
delete screenshot;
}
}
#endif