Stefan Seyfried
a112e8fb49
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
Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
Michael Liebmann
1918153c0a
Preparing the menu classes for Lua Part #2
...
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-16 (Thu, 16 Jan 2014)
Origin message was:
------------------
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
13ac3b81eb
Merge remote-tracking branch 'check/next-cc'
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-19 (Sun, 19 Jan 2014)
2014-01-19 13:37:24 +01:00
Jacek Jendrzej
7c54d3847f
CControlAPI::EpgSearchCGI add duration to txt output
...
Origin commit data
------------------
Commit: 59b3245680
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-18 (Sat, 18 Jan 2014)
2014-01-18 20:17:24 +01:00
Jacek Jendrzej
d914cab390
CControlAPI:: epgsearchxml fix time format
...
Origin commit data
------------------
Commit: 3f65005339
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-16 (Thu, 16 Jan 2014)
2014-01-16 18:46:51 +01:00
Jacek Jendrzej
7cee0a604e
CControlAPI:: -add epgsearchxml & epgsearch
...
Origin commit data
------------------
Commit: f373f621ef
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-01-14 (Tue, 14 Jan 2014)
2014-01-14 19:15:46 +01:00
Stefan Seyfried
ad3e76b0ff
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)
Origin commit data
------------------
Commit: 07caa88ad2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 21:03:11 +01:00
Stefan Seyfried
1eb4a45475
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.
Origin commit data
------------------
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 20:57:40 +01:00
Stefan Seyfried
80aa3301f2
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)
Origin commit data
------------------
Commit: d1eebea381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 16:56:41 +01:00
Stefan Seyfried
e48a154e06
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.
Origin commit data
------------------
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 15:07:31 +01:00
Stefan Seyfried
3aaf6770ea
Merge remote-tracking branch 'check/next-cc'
...
Origin commit data
------------------
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-29 (Sun, 29 Dec 2013)
2013-12-29 22:12:09 +01:00
martii
586f6f0d4d
nhttpd/controlapi: add mode=all to GetBouquetCGI
...
Origin commit data
------------------
Commit: 0b730409ed
Author: martii <m4rtii@gmx.de >
Date: 2013-12-26 (Thu, 26 Dec 2013)
2013-12-26 13:35:01 +01:00
martii
157229b653
nhttpd/controlapi: GetBouquetsCGI: support "mode=all" (compiles, untested)
...
Origin commit data
------------------
Commit: 83534791ef
Author: martii <m4rtii@gmx.de >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-26 13:35:01 +01:00
Stefan Seyfried
ccc691278c
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
Jacek Jendrzej
0171760145
CControlAPI::GetBouquetsCGI: -add TV/RADDIO mode selectable (THX martii)
...
Origin commit data
------------------
Commit: 0866bc65a7
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 18:11:33 +01:00
Stefan Seyfried
ffcb0147ac
Merge remote-tracking branch 'check/next-cc'
...
Origin commit data
------------------
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-07 (Sat, 07 Dec 2013)
2013-12-07 18:28:56 +01:00
vanhofen
1af32e8871
yWeb: use same order in search for channellogos as neutrino
...
Origin commit data
------------------
Commit: a8f7668a9c
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-12-06 (Fri, 06 Dec 2013)
Origin message was:
------------------
- yWeb: use same order in search for channellogos as neutrino
2013-12-06 13:30:52 +01:00
Stefan Seyfried
4d7f78c8a0
Makefiles: simplify includes for libcoolstream/libstb-hal
...
Origin commit data
------------------
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-11 (Mon, 11 Nov 2013)
2013-11-11 21:51:08 +01:00
Stefan Seyfried
80b809a370
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
Jacek Jendrzej
357aa31bc8
CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG
...
Origin commit data
------------------
Commit: aaad29a245
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-11-05 (Tue, 05 Nov 2013)
2013-11-05 15:42:50 +01:00
Stefan Seyfried
e6cbfe61bc
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
Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
Michael Liebmann
a23a77f605
Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
...
Origin commit data
------------------
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-10-14 (Mon, 14 Oct 2013)
2013-10-17 04:22:49 +02:00
Jacek Jendrzej
c0846d75a4
CControlAPI::GetBouquetCGI fix segfault
...
Origin commit data
------------------
Commit: 733f7a5382
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-10-12 (Sat, 12 Oct 2013)
2013-10-12 22:01:17 +02:00
Jacek Jendrzej
19b809ffed
CControlAPI::EpgCGI fix control/epg
...
Origin commit data
------------------
Commit: 03b7151563
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-10-12 (Sat, 12 Oct 2013)
2013-10-12 21:39:41 +02:00
[CST] Focus
74fd8f361f
neutrino: add EAC3 audio support
...
Origin commit data
------------------
Commit: 2e6276def7
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-08 17:18:35 +04:00
vanhofen
0f0418e159
controlapi: use rcsim.h
...
Origin commit data
------------------
Commit: 5c2fbf3348
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-10-04 (Fri, 04 Oct 2013)
Origin message was:
------------------
- controlapi: use rcsim.h
2013-10-04 12:00:28 +02:00
Jacek Jendrzej
3b8ec519eb
CControlAPI::SendChannelList: show only unique channellist & currenttpchannels
...
Origin commit data
------------------
Commit: 9d7751dc8c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-10-01 (Tue, 01 Oct 2013)
2013-10-01 17:55:18 +02:00
vanhofen
1392bdf4e7
yweb: fix /control/reboot
...
Origin commit data
------------------
Commit: 5227f726c9
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-09-28 (Sat, 28 Sep 2013)
Origin message was:
------------------
- yweb: fix /control/reboot
2013-09-28 22:25:41 +02:00
[CST] Focus
c7462305ca
nhttpd/tuxboxapi/coolstream/controlapi.cpp: wakeup zapit before neutrino,
...
to be sure zapit will process any next commands
Origin commit data
------------------
Commit: d26bc23f6b
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-09-27 (Fri, 27 Sep 2013)
2013-09-27 16:27:21 +04:00
[CST] Focus
709c0d9a8a
nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp: fix memleak in GetChannelEvents()
...
Origin commit data
------------------
Commit: a2d5ccdce2
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-09-25 (Wed, 25 Sep 2013)
2013-09-25 17:08:34 +04:00
Jacek Jendrzej
bb52ce2f56
CControlAPI::_GetBouquetWriteItem: -fix UTF-8 (THX Gaucho316) http://www.dbox2world.net/index.php?page=Thread&postID=157423
...
Origin commit data
------------------
Commit: c06e0c4bb4
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-09-24 (Tue, 24 Sep 2013)
2013-09-24 12:39:54 +02:00
vanhofen
93b0807ac0
yweb: remove delivery_system from boxtype tank
...
and avoid duplicate code
Origin commit data
------------------
Commit: 99b477207f
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-09-20 (Fri, 20 Sep 2013)
Origin message was:
------------------
- yweb: remove delivery_system from boxtype tank
and avoid duplicate code
2013-09-20 13:36:42 +02:00
[CST] Focus
4fd10c07c6
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
Origin commit data
------------------
Commit: 2df40249d6
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 18:23:20 +04:00
Stefan Seyfried
2c76238007
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
Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
vanhofen
e6564a4f2a
controlapi/yparser: detect new models tank and trinity
...
Origin commit data
------------------
Commit: efe212413b
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-08-15 (Thu, 15 Aug 2013)
Origin message was:
------------------
- controlapi/yparser: detect new models tank and trinity
2013-08-15 16:25:38 +02:00
vanhofen
bec445b476
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
Origin commit data
------------------
Commit: ff161a699c
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-08-09 (Fri, 09 Aug 2013)
Origin message was:
------------------
- 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
Stefan Seyfried
6830b68cac
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
Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
vanhofen
6de6fcef79
yweb: rework classifying slidertable in channellist for a smoother view
...
Origin commit data
------------------
Commit: 63173fd5e2
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-06-28 (Fri, 28 Jun 2013)
Origin message was:
------------------
- yweb: rework classifying slidertable in channellist for a smoother view
2013-06-28 00:52:59 +02:00
Stefan Seyfried
fce4dbbe72
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
Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
vanhofen
74ef42378f
yweb: use more matching zee-remotecontrol for neo twin
...
Origin commit data
------------------
Commit: aa0920d807
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-06-13 (Thu, 13 Jun 2013)
Origin message was:
------------------
- yweb: use more matching zee-remotecontrol for neo twin
2013-06-13 11:43:40 +02:00
Stefan Seyfried
093e651a83
don't use sizeof(pointer), it is not useful :-)
...
Origin commit data
------------------
Commit: a7dfc9757a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-28 (Tue, 28 May 2013)
2013-05-28 14:27:51 +02:00
Stefan Seyfried
b6e65d0300
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
Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-24 (Fri, 24 May 2013)
2013-05-24 20:24:39 +02:00
vanhofen
9e790476cb
yweb: add key 'sleep'
...
Origin commit data
------------------
Commit: ee4a4cbea1
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-05-14 (Tue, 14 May 2013)
Origin message was:
------------------
- yweb: add key 'sleep'
2013-05-14 22:40:49 +02:00
Stefan Seyfried
f6c0718366
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
Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
Stefan Seyfried
36c317f2d6
nhttpd: fix streaming with non-standard port
...
Origin commit data
------------------
Commit: 5db15cc630
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 10:02:33 +04:00
Stefan Seyfried
b620a0b9e1
nhttpd: fix streaming with non-standard port
...
Origin commit data
------------------
Commit: 069bf46578
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:49:47 +02:00
[CST] Focus
f1b2e5cef6
remove 'coolstream' from gui
...
Origin commit data
------------------
Commit: cdf10ef46e
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-22 (Fri, 22 Mar 2013)
2013-03-22 10:52:39 +04:00
[CST] Focus
14a1809e79
nhttpd/tuxboxapi/coolstream/controlapi.cpp: create screenshot in sync mode
...
Origin commit data
------------------
Commit: 370e3dd690
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-03-19 (Tue, 19 Mar 2013)
2013-03-19 17:24:09 +04:00
Stefan Seyfried
d3531638eb
neutrino: fix most hardcoded paths
...
Origin commit data
------------------
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 02:01:52 +01:00
Stefan Seyfried
2158fee441
remove obsolete embedded libtriple
...
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
Origin commit data
------------------
Commit: d2d8218885
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-03-06 (Wed, 06 Mar 2013)
2013-03-06 17:23:46 +01:00