Commit Graph

368 Commits

Author SHA1 Message Date
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
7d87ce9c54 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing
2013-12-22 21:25:05 +01:00
martii
7d59c8a079 yweb: remove audio_PCMOffset configuration option 2013-12-22 16:36:13 +01:00
svenhoefer
7f72fa6f3d - mod_auth.cpp: fix no_auth_client handling
change find() to compare()
2013-12-14 22:27:19 +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
svenhoefer
1e8764be2e - ylanguage.cpp: fix wrong value in for loop 2013-11-09 14:40:58 +01:00
svenhoefer
5324c57a38 - ylanguage.cpp: add neutrino locale as an additional locale file for yWeb 2013-11-08 15:07:02 +01:00
Jacek Jendrzej
aaad29a245 CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG 2013-11-05 15:42:50 +01:00
svenhoefer
87f9ac539b - yWeb: remove descriptions from rcu tooltips 2013-11-04 09:25:43 +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
svenhoefer
d9ee92f83d - yweb: add missing trinity rcu entry 2013-10-01 08:32:29 +02:00
svenhoefer
5227f726c9 - yweb: fix /control/reboot 2013-09-28 22:25:41 +02:00
[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