From a5c8b89d8b74d65f4e086dac5a1bf4f87953b80f Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 12 Feb 2013 13:58:21 +0100
Subject: [PATCH] controlapi.cpp: make ScreenshotCGI() more configurable

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/133740da14553a69695fd5561967210343ca4a2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- controlapi.cpp: make ScreenshotCGI() more configurable
---
 src/nhttpd/doc/nhttpd_controlapi.html         | 12 +++++++++---
 .../tuxboxapi/coolstream/controlapi.cpp       | 19 ++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/nhttpd/doc/nhttpd_controlapi.html b/src/nhttpd/doc/nhttpd_controlapi.html
index e87fa6c56..2632352cc 100644
--- a/src/nhttpd/doc/nhttpd_controlapi.html
+++ b/src/nhttpd/doc/nhttpd_controlapi.html
@@ -1829,11 +1829,17 @@ Die Pluginliste wird neu geladen.
 <div class="title1"><a name="screenshot"></a>42. Screenshot erstellen</div>
 <div class="URL">Handler: http://dbox/control/screenshot</div>
 <br>
-<b>Parameter:</b> keine<br>
-<b>Rükgabe</b>: ok<br>
+<b>Parameter:</b> name=&lt;dateiname&gt;&amp;osd=1|0&amp;video=1|0<br><br>
+<b>Rückgabe</b>: ok<br>
 <br>
-Screenshot mit TV Bild und OSD wird erstellt und unter /tmp/screenshot.png abgelegt.
+Screenshot mit TV Bild und OSD wird erstellt und unter /tmp/&lt;dateiname&gt;.png abgelegt.
 <br>
+<div class="example">
+Beispiel:<br>
+<br>
+&gt;&gt;&gt;http://dbox/control/screenshot?osd=0&amp;video=1<br>
+ok<br>
+&nbsp;</div>
 &nbsp;&nbsp;</p>
 
 
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index f212fab5f..8434428db 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -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?
 }
 
 //-----------------------------------------------------------------------------