Commit Graph

535 Commits

Author SHA1 Message Date
[CST] Focus
d26bc23f6b nhttpd/tuxboxapi/coolstream/controlapi.cpp: wakeup zapit before neutrino,
to be sure zapit will process any next commands
2013-09-27 16:27:21 +04:00
[CST] Focus
a2d5ccdce2 nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp: fix memleak in GetChannelEvents() 2013-09-25 17:08:34 +04:00
Jacek Jendrzej
c06e0c4bb4 CControlAPI::_GetBouquetWriteItem: -fix UTF-8 (THX Gaucho316) http://www.dbox2world.net/index.php?page=Thread&postID=157423 2013-09-24 12:39:54 +02:00
svenhoefer
18a24d18bd - yweb: disable non-working rec on/off buttons 2013-09-20 14:57:06 +02:00
svenhoefer
8561622751 - yweb: fix typo in startpage definition 2013-09-20 14:31:05 +02:00
svenhoefer
99b477207f - yweb: remove delivery_system from boxtype tank
and avoid duplicate code
2013-09-20 13:36:42 +02:00
svenhoefer
c7b03680b4 - yweb: add trinity rcu 2013-09-20 12:09:36 +02:00
[CST] Focus
2df40249d6 nhttpd/tuxboxapi/coolstream/controlapi.cpp: call GetChannelEvents only if epg param present,
add 'fav' param to get only user bouquets;
add support to get bouquet's channel list with epg also in plain format
2013-09-03 18:23:20 +04:00
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
2013-09-01 19:46:10 +02:00
svenhoefer
ed88cd49e5 - yweb: add tank remote control 2013-08-15 18:18:05 +02:00
svenhoefer
ce00efbd24 - yweb: add picture for tank remote control 2013-08-15 16:40:38 +02:00
svenhoefer
efe212413b - controlapi/yparser: detect new models tank and trinity 2013-08-15 16:25:38 +02:00
svenhoefer
ff161a699c - yweb: add PCR PID handling to live streaming ...
... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git
2013-08-09 11:04:26 +02:00
Jacek Jendrzej
fd911c9deb update slovak locale (THX EnoSat) 2013-08-08 15:30:16 +02:00
svenhoefer
c866bf0866 - yweb: fix position and dimension of volume table 2013-07-07 22:33:21 +02:00
svenhoefer
262820f927 - yweb: increase left secondary menu frame
* increase version for last 3 commits. sry
2013-07-07 22:29:50 +02:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
2013-07-06 19:01:15 +02:00
svenhoefer
af662827d5 - yweb: remove obsolete Y_Settings.yhtm 2013-07-06 08:43:43 +02:00
svenhoefer
2c1477f46c - yweb: split links to screenshot pages to different list rows 2013-07-06 08:41:07 +02:00
svenhoefer
a78fcbc6a9 - yweb: add new function 'add_yExtensions()' to avoid duplicate code
* remove prefix '-' from added items
* add class 'y_menu_sec_ext' to added items
* rename unused class 'y_menu_prim_item' to 'y_menu_prim_ext'
2013-07-05 16:08:30 +02:00
svenhoefer
9e90a1ac56 - yweb: don't add undefined info urls to extentions page 2013-07-05 13:37:11 +02:00
svenhoefer
431ec51419 - yweb: fix fallback path to extentions.txt 2013-07-05 13:35:08 +02:00
svenhoefer
1b7c7fecf6 - yweb: new images for remotecontrols v3 (zee and neo2) and v4 (neo twin)
special thanks to luuk@astrasat for support

* add image for remotecontrol v4 (neo twin)
* replace german images with plain images and localized tooltips.
2013-07-01 15:19:58 +02:00
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