martii
81ca577fb8
overload access(2)
...
Conflicts:
src/driver/pictureviewer/pictureviewer.cpp
src/gui/components/cc_item_picture.cpp
src/gui/movieplayer.cpp
src/gui/osdlang_setup.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.h
src/system/setting_helpers.cpp
2014-09-24 19:50:35 +04:00
Benny
0f16c9441e
add localization tag for time elapsed/remaining
2014-09-23 12:46:40 +02:00
[CST] Focus
a473fe8194
webtv channels integration port,
...
initial code (C) martii,
initial patch from jacek
2014-08-27 17:32:26 +04:00
martii
ff46970457
nttpd: allow sendfile() to cope with files >= 2GB; introduce range support
...
(This re-applies most of the patches I've reverted about two hours ago.)
2014-08-26 17:31:57 +04:00
Jacek Jendrzej
cf0bf3fa20
Revert "nhttpd: let sendfile() support files >= 2GB"
...
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.
2014-08-26 17:31:48 +04:00
martii
d71958ba8c
nhttpd: let sendfile() support files >= 2GB
2014-08-26 17:31:22 +04:00
svenhoefer
8322c9e408
- neutrinoyparser: detect Zee²; fix Boxmodel for Trinity
2014-06-27 10:41:01 +02:00
Stefan Seyfried
44ba8fafca
Merge remote-tracking branch 'check/next-cc'
...
build-tested only, needs fixing
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/Makefile.am
src/driver/rcinput.cpp
src/driver/streamts.cpp
src/eitd/sectionsd.cpp
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/hdd_menu.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/pluginlist.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/user_menue.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrinoMessages.h
src/system/locals.h
src/system/locals_intern.h
src/zapit/include/zapit/scan.h
src/zapit/src/femanager.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2014-04-27 19:14:06 +02:00
[CST] Focus
c78676f7fd
fix warnings if some want to use c++11
2014-04-21 14:07:38 +04:00
svenhoefer
1e2290a758
- yWeb: scale channellogos in channellist and epg plus
2014-04-01 17:59:04 +02:00
svenhoefer
a3e8142fae
- controlapi: add boxmodel to control/info?hwinfo
2014-03-26 13:25:06 +01:00
svenhoefer
d4dc3fcbbd
- neutrinoyparser: remove delivery_system from boxname
2014-03-26 13:25:06 +01:00
svenhoefer
d81b50523c
- neutrinoyparser: add function 'get_boxmodel'
2014-03-26 13:25:06 +01:00
Stefan Seyfried
ecd62d81d1
Merge remote-tracking branch 'check/next-cc'
...
...only build-tested, needs fixes
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
1e2e14e134
CControlAPI::EpgSearchXMLCGI convert channelname to xml
2014-02-13 20:12:31 +01:00
M. Liebmann
92fce346c0
yWeb: Synchronize volume/audiomute settings yWeb => GUI
2014-02-12 06:02:27 +01:00
svenhoefer
63d66538ce
- CControlAPI: SignalInfoCGI: don't show description in explicit calls
2014-02-10 21:50:34 +01:00
Jacek Jendrzej
8d01e2152a
CControlAPI:: -add SignalInfoCGI
2014-02-10 21:14:54 +01:00
Stefan Seyfried
65437a60a8
Merge remote-tracking branch 'broken/next-cc'
2014-01-28 13:22:00 +01:00
Jacek Jendrzej
9855a220be
webif standby -add option CEC standby off (dont use TV off)
2014-01-28 10:30:29 +01:00
Stefan Seyfried
e9bc524562
Merge remote-tracking branch 'check/next-cc'
2014-01-27 21:00:18 +01:00
Jacek Jendrzej
372b367b8b
supplement to 4be0273083 cec option in standby off and on
2014-01-27 20:26:46 +01:00
Jacek Jendrzej
4be0273083
-add webif option dont use CEC with standbyoff
2014-01-26 22:24:17 +01:00
Stefan Seyfried
b414474323
Merge remote-tracking branch 'check/next-cc'
...
compiles, nothing else.
Conflicts:
configure.ac
src/Makefile.am
src/gui/Makefile.am
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan_setup.cpp
src/gui/start_wizard.cpp
src/gui/test_menu.cpp
src/gui/user_menue.cpp
src/gui/widget/hintboxext.cpp
src/gui/widget/menue.cpp
src/gui/widget/messagebox.cpp
src/gui/widget/stringinput.cpp
2014-01-23 14:08:37 +01:00
M. Liebmann
b41819190d
Preparing the menu classes for Lua Part #2
...
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
eca8f5459b
Merge remote-tracking branch 'check/next-cc'
...
Conflicts:
src/neutrino.cpp
2014-01-19 13:37:24 +01:00
Jacek Jendrzej
59b3245680
CControlAPI::EpgSearchCGI add duration to txt output
2014-01-18 20:17:24 +01:00
Jacek Jendrzej
3f65005339
CControlAPI:: epgsearchxml fix time format
2014-01-16 18:46:51 +01:00
Jacek Jendrzej
f373f621ef
CControlAPI:: -add epgsearchxml & epgsearch
2014-01-14 19:15:46 +01:00
Stefan Seyfried
07caa88ad2
timerd: rename TIMER_NEXTPROGRAM
...
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
2014-01-13 21:03:11 +01:00
Stefan Seyfried
49035cedec
timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
...
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
2014-01-13 20:57:40 +01:00
Stefan Seyfried
d1eebea381
timerd: rename TIMER_NEXTPROGRAM
...
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
2014-01-12 16:56:41 +01:00
Stefan Seyfried
c68a67529c
timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
...
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
2014-01-12 15:07:31 +01:00
Stefan Seyfried
7d379dcb30
Merge remote-tracking branch 'check/next-cc'
2013-12-29 22:12:09 +01:00
martii
0b730409ed
nhttpd/controlapi: add mode=all to GetBouquetCGI
2013-12-26 13:35:01 +01:00
martii
83534791ef
nhttpd/controlapi: GetBouquetsCGI: support "mode=all" (compiles, untested)
2013-12-26 13:35:01 +01:00
Stefan Seyfried
cdd065fc2e
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
2013-12-25 22:51:23 +01:00
Jacek Jendrzej
0866bc65a7
CControlAPI::GetBouquetsCGI: -add TV/RADDIO mode selectable (THX martii)
2013-12-25 18:11:33 +01:00
Stefan Seyfried
5976f03ca2
Merge remote-tracking branch 'check/next-cc'
2013-12-07 18:28:56 +01:00
svenhoefer
a8f7668a9c
- yWeb: use same order in search for channellogos as neutrino
2013-12-06 13:30:52 +01:00
Stefan Seyfried
3a728f9ee1
Makefiles: simplify includes for libcoolstream/libstb-hal
2013-11-11 21:51:08 +01:00
Stefan Seyfried
b93a372b54
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
2013-11-10 16:55:53 +01:00
Jacek Jendrzej
aaad29a245
CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG
2013-11-05 15:42:50 +01:00
Stefan Seyfried
d244a5991a
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
Michael Liebmann
5091e920fc
Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
2013-10-17 04:22:49 +02:00
Jacek Jendrzej
733f7a5382
CControlAPI::GetBouquetCGI fix segfault
2013-10-12 22:01:17 +02:00
Jacek Jendrzej
03b7151563
CControlAPI::EpgCGI fix control/epg
2013-10-12 21:39:41 +02:00
[CST] Focus
2e6276def7
neutrino: add EAC3 audio support
2013-10-08 17:18:35 +04:00
svenhoefer
5c2fbf3348
- controlapi: use rcsim.h
2013-10-04 12:00:28 +02:00
Jacek Jendrzej
9d7751dc8c
CControlAPI::SendChannelList: show only unique channellist & currenttpchannels
2013-10-01 17:55:18 +02:00
