mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' into next

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
[CST] Focus
2013-02-28 16:39:34 +04:00
parent cddfcf3bf9 e74f1db278
commit 026592e8fe
70 changed files with 544 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/tuxboxapi/coolstream/Makefile.am
View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
INCLUDES = \
-I$(top_builddir) \

12
src/nhttpd/web/Y_Tools_Screenshot.yhtm
View File

@@ -1,3 +1,5 @@
{=var-set:fbshot={=if-file-exists:/bin/fbshot~true~{=if-file-exists:/var/bin/fbshot~true~false=}=}=}
{=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script>
@@ -41,8 +43,12 @@ function do_snapshot() {
filename = id("filename").value;
}
var _null = loadSyncURL("/control/screenshot?name="+filename+"&osd="+enableOSD+"&video="+enableVideo);
window.setTimeout("do_showshot('"+filename+"');", (enableVideo == 1) ? 3500 : 1500);
if ({=var-get:fbshot=} == true && enableVideo == 0)
dbox_exec_tools("fbshot fb /tmp/"+filename+".png");
else
loadSyncURL("/control/screenshot?name="+filename+"&osd="+enableOSD+"&video="+enableVideo);
window.setTimeout("do_showshot('"+filename+"');", (enableVideo == 1) ? 6500 : 3000);
}
function do_showshot(_filename) {
if (_filename == "")
@@ -102,7 +108,7 @@ function do_zoomshot(){
{=include-block:Y_Blocks.txt;remote=}
</td>
<td class="shot">
<img id="shot" src="" onclick="do_zoomshot()" style="display: none" title="Click to zoom" />
<img id="shot" src="" onclick="do_zoomshot()" style="display: none" />
</td>
</tr>
</table>