Handler: http://dbox/control/screenshot
-Parameter: keine
-Rükgabe: ok
+Parameter: name=<dateiname>&osd=1|0&video=1|0
+Rückgabe: ok
-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/<dateiname>.png abgelegt.
+
+Beispiel:
+
+>>>http://dbox/control/screenshot?osd=0&video=1
+ok
+
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index a3beb60b7..8df655346 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -1466,10 +1466,23 @@ void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
#ifdef SCREENSHOT
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?
}
#endif
diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am
index 7a1a58268..858dbdf7d 100644
--- a/src/nhttpd/web/Makefile.am
+++ b/src/nhttpd/web/Makefile.am
@@ -75,7 +75,6 @@ install_DATA = channels.js \
Y_Tools_Boxcontrol.yhtm \
Y_Tools_Check_Install.yhtm \
Y_Tools_Cmd.yhtm \
- Y_Tools_fbshot.yhtm \
Y_Tools_Flash_Menue.yhtm \
Y_Tools_Flash_Upload.yhtm \
Y_Tools_Info_Menue.yhtm \
@@ -83,7 +82,7 @@ install_DATA = channels.js \
Y_Tools_lcshot.yhtm \
Y_Tools_Menue.yhtm \
Y_Tools_Rcsim.yhtm \
- Y_Tools_remote_osd.yhtm \
+ Y_Tools_Screenshot.yhtm \
Y_Tools_Timer_Sync.js \
Y_Tools_Timer_Sync.yhtm \
Y_Tools_tvshot.yhtm \
diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm
index c75361b24..536cd1dc7 100644
--- a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm
+++ b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm
@@ -72,8 +72,6 @@ function init(){
{=var-set:lcshot={=if-file-exists:/bin/lcshot~true~{=if-file-exists:/var/bin/lcshot~true~false=}=}=}
-{=var-set:fbshot={=if-file-exists:/bin/fbshot~true~{=if-file-exists:/var/bin/fbshot~true~{=if-file-exists:/bin/dboxshot~true~{=if-file-exists:/var/bin/dboxshot~true~false=}=}=}=}=}
-{=var-set:dboxshot={=if-file-exists:/bin/dboxshot~true~{=if-file-exists:/var/bin/dboxshot~true~false=}=}=}
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css
index 7f48c980d..705b64cad 100644
--- a/src/nhttpd/web/Y_Main.css
+++ b/src/nhttpd/web/Y_Main.css
@@ -12,6 +12,18 @@ button,input,select,form,td {
font-family: Verdana, Geneva, Arial, 'Lucida Grande',Tahoma, Helvetica, sans-serif;
color:#555555;
}
+.left {
+ float: left;
+}
+.right {
+ float: right;
+}
+.clear {
+ clear: both;
+ line-height: 0px;
+ height: 0;
+ overflow: hidden;
+}
/* buttons */
a img:hover {
position:relative;
@@ -37,8 +49,9 @@ button[ytype="zap"]{background-image:url(/images/zap.png);}
button[ytype="timeup"]{background-image:url(/images/time_up.png);}
button[ytype="timedown"]{background-image:url(/images/time_down.png);}
button[ytype="timeadd"]{background-image:url(/images/time_add.png);}
-button[ytype="shot"]{background-image:url(/images/snapshot.png);}
+button[ytype="snapshot"]{background-image:url(/images/snapshot.png);}
button[ytype="clearshot"]{background-image:url(/images/remove.png);}
+button[ytype="zoomshot"]{background-image:url(/images/fullscreen.png);}
button[ytype="go"]{background-image:url(/images/accept.png);}
button[ytype="download"]{background-image:url(/images/wget.gif);}
button[ytype="clear"]{background-image:url(/images/remove.png);}
@@ -846,3 +859,20 @@ a.timer {
.lt_table td {
white-space: pre-wrap;
}
+
+/* screenshots */
+#screenshot_header {
+ height: 30px;
+}
+td.shot {
+ vertical-align: top;
+}
+img#shot {
+ width: 100%;
+ background-color: #ffffff;
+ border: 1px solid #f5f5f5;
+ margin: 10px 0;
+}
+img#shot:hover {
+ cursor: pointer;
+}
diff --git a/src/nhttpd/web/Y_Menue.yhtm b/src/nhttpd/web/Y_Menue.yhtm
index b2965a68d..0ba6a9ad0 100644
--- a/src/nhttpd/web/Y_Menue.yhtm
+++ b/src/nhttpd/web/Y_Menue.yhtm
@@ -120,7 +120,7 @@ function vlc() {
+
+>>>http://dbox/control/screenshot?osd=0&video=1
+ok
+
- 
+
diff --git a/src/nhttpd/web/Y_Settings_nhttpd.yhtm b/src/nhttpd/web/Y_Settings_nhttpd.yhtm
index 655e54b5b..5418e22a4 100644
--- a/src/nhttpd/web/Y_Settings_nhttpd.yhtm
+++ b/src/nhttpd/web/Y_Settings_nhttpd.yhtm
@@ -99,7 +99,7 @@ function do_submit()
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
{=L:set.nhttpd.ips_without_keep_alive_desc=}
+
+
+ {=var-set:help_url==}{=var-set:menu={=L:bc.menue.remote=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=include-block:Y_Blocks.txt;remote=}
+
+