Commit Graph

362 Commits

Author SHA1 Message Date
svenhoefer
f7ff06485f - yweb: fix 5f87a12 (change eventhandler to new function) 2013-06-29 01:26:14 +02:00
svenhoefer
63173fd5e2 - yweb: rework classifying slidertable in channellist for a smoother view 2013-06-28 00:52:59 +02:00
svenhoefer
9078775a0a - yweb: re-introduce 'WebsiteMain.hosted_directory'
* this directory can be used to host some of your cracy stuff.
  yhtm, yjs and ysh will also parsed now. it is reachable with
  <boxip>/hosted/
* if exist a subdir named 'logos' in this directory you can use
  this as an external logo-dir for yweb too
* path can be configured with '--with-hosted_httpddir=PATH'
2013-06-27 12:20:29 +02:00
svenhoefer
5f87a1246d - yweb: a more suitable caption of remotecontrol button 2013-06-25 10:37:00 +02:00
svenhoefer
177eb70b91 - yweb: use a more matching icon for remotecontrol 2013-06-25 09:59:28 +02:00
svenhoefer
ef64f1dfbc - yweb: supplement2 to 915789c (typo) 2013-06-25 08:31:28 +02:00
svenhoefer
b9d9bdc21b - yweb: supplement to 915789c (the missing language entrys) 2013-06-24 15:37:14 +02:00
svenhoefer
915789cac8 - yweb: use correct remotecontrol in dependecy from neutrino-setting ...
... or choose another remotecontrol for yweb only

* TODO: add an image an an imagemap for remotecontrol v4 (neo twin)
* imagemaps for dbox-remotecontrols are taken from tuxbox neutrino
2013-06-24 15:15:13 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
2013-06-16 21:22:14 +02:00
svenhoefer
aa0920d807 - yweb: use more matching zee-remotecontrol for neo twin 2013-06-13 11:43:40 +02:00
Stefan Seyfried
860443c4e3 ywebserver: try to use port 8080 if port 80 is not available 2013-05-28 16:24:49 +02:00
Stefan Seyfried
e0a051e74c ywebserver: try to use port 8080 if port 80 is not available 2013-05-28 14:35:11 +02:00
Stefan Seyfried
a7dfc9757a don't use sizeof(pointer), it is not useful :-) 2013-05-28 14:27:51 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
2013-05-24 20:24:39 +02:00
svenhoefer
ee4a4cbea1 - yweb: add key 'sleep' 2013-05-14 22:40:49 +02:00
Stefan Seyfried
93d01c1987 nhttpd: fix shutdown path 2013-05-11 17:43:24 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
2013-05-10 10:06:47 +02:00
Stefan Seyfried
363633dc1b yhttpd: cleaner shutdown 2013-05-09 16:19:55 +02:00
Jacek Jendrzej
127401da9c nhttpd: -add Slovak language by EnoSat 2013-05-01 11:52:24 +02:00
Jacek Jendrzej
1379fe80d3 nhttpd: -add Slovak language by EnoSat 2013-05-01 11:50:39 +02:00
svenhoefer
2503a742a9 - yweb: fix area for FAV-key on zee 2013-04-22 17:32:10 +02:00
Michael Liebmann
92aeed48ee * yhttpd: Add missing includepath 2013-04-18 18:51:58 +01:00
[CST] Focus
dcf0703cd0 remove more 'coolstream' from webif 2013-04-10 19:23:08 +04:00
[CST] Focus
4b5a840b2e remove 'coolstream' from webif 2013-04-10 18:39:28 +04:00
Stefan Seyfried
5db15cc630 nhttpd: fix streaming with non-standard port 2013-04-08 10:02:33 +04:00
Stefan Seyfried
069bf46578 nhttpd: fix streaming with non-standard port 2013-04-06 11:49:47 +02:00
[CST] Focus
cdf10ef46e remove 'coolstream' from gui 2013-03-22 10:52:39 +04:00
[CST] Focus
8f128cc512 src/nhttpd/web/Y_Tools_Screenshot.yhtm: remove window.setTimeout,
it seems fbshot executed in sync, not in background ?
so not clear why to wait here after screenshot is ready.
video screenshot now also not async
2013-03-19 17:27:38 +04:00
[CST] Focus
370e3dd690 nhttpd/tuxboxapi/coolstream/controlapi.cpp: create screenshot in sync mode 2013-03-19 17:24:09 +04:00
Stefan Seyfried
166e403965 neutrino: fix most hardcoded paths
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp
2013-03-12 17:16:13 +04:00
Stefan Seyfried
ffd4daea7c neutrino: fix most hardcoded paths 2013-03-10 02:01:52 +01:00
Stefan Seyfried
d2d8218885 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
2013-03-06 17:23:46 +01:00
[CST] Focus
026592e8fe Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2013-02-28 16:39:34 +04:00
Stefan Seyfried
0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2013-02-21 17:07:18 +01:00
Stefan Seyfried
4dbeb3a31e neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
2013-02-21 15:47:18 +01:00
svenhoefer
bf56c88ee4 - yweb: return to /bin/fbshot for osd-only screenshots
the internal screenshot function seems paralyzed sometimes.
2013-02-19 12:07:29 +01:00
[CST] Focus
6174c657a1 Merge branch 'dvbsi++' into next 2013-02-13 15:34:41 +04:00
svenhoefer
73d44517e7 - yweb: remove unused variable from Y_Boxcontrol_Menue.yhtm 2013-02-12 23:16:45 +01:00
svenhoefer
71f2c8c9a7 - yweb: merge tv-shot and osd-shot to one page
* use internal screenshot-function to make osd-shots
2013-02-12 23:12:20 +01:00
svenhoefer
133740da14 - controlapi.cpp: make ScreenshotCGI() more configurable 2013-02-12 13:58:21 +01:00
svenhoefer
08fd651d60 - yweb: fix a little syntax error in Y_Settings_nhttpd.yhtm 2013-02-12 13:21:43 +01:00
svenhoefer
9feb5249a4 - yweb: add the workbox around the remote control 2013-02-12 11:31:41 +01:00
[CST] Focus
46657a1c6b merge dvbsi++ 2013-02-11 13:29:09 +04:00
svenhoefer
e2b22e656e - yweb: supplement to c2668d2f2c
* add a background-image to zoomshot-button
2013-02-10 23:25:16 +01:00
svenhoefer
c2668d2f2c - yweb: rework Y_Tools_remote_osd.yhtm
* use only one file to make osd-shots
* add a (not really) zoom-function
* add posibility to change filename
* add needed locals
* remove Y_Tools_fbshot.yhtm
2013-02-06 22:14:10 +01:00
svenhoefer
01c6cf0104 - yweb: disable horizontal scrolling in screenshot-pages 2013-02-04 15:07:27 +01:00
[CST] Focus
720bfba267 nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: filter channels, show real channel number 2013-01-30 13:05:08 +04:00
[CST] Bas
d1046fd8a5 neutrino make nhttpd depend on neutrino's config. 2013-01-29 01:20:28 +08:00
[CST] Bas
ee169288a5 neutrino: add multiple paths so they can be configured and not be hard-coded in
multiple files.
2013-01-29 01:18:38 +08:00
[CST] Bas
9055caf32b neutrino: remove space from nhttpd.conf.in. 2013-01-29 01:17:23 +08:00