Commit Graph

153 Commits

Author SHA1 Message Date
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
martii
9e2ad55568 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.)


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff46970457
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)



------------------
This commit was generated by Migit
2014-08-26 17:31:57 +04:00
Jacek Jendrzej
56f7daa01a Revert "nhttpd: let sendfile() support files >= 2GB"
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.


Origin commit data
------------------
Branch: ni/coolstream
Commit: cf0bf3fa20
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)



------------------
This commit was generated by Migit
2014-08-26 17:31:48 +04:00
martii
24f9a990b4 nhttpd: let sendfile() support files >= 2GB
Origin commit data
------------------
Branch: ni/coolstream
Commit: d71958ba8c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-08-26 17:31:22 +04:00
vanhofen
e99fb152b2 neutrinoyparser: detect Zee²; fix Boxmodel for Trinity
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8322c9e408
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)

Origin message was:
------------------
- neutrinoyparser: detect Zee²; fix Boxmodel for Trinity

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-06-27 10:41:01 +02:00
[CST] Focus
61bc54199f fix warnings if some want to use c++11
Origin commit data
------------------
Branch: ni/coolstream
Commit: c78676f7fd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-17 (Thu, 17 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-21 14:07:38 +04:00
vanhofen
a2176524d2 yWeb: scale channellogos in channellist and epg plus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e2290a758
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-04-01 (Tue, 01 Apr 2014)

Origin message was:
------------------
- yWeb: scale channellogos in channellist and epg plus

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-01 17:59:04 +02:00
vanhofen
7cc9ca31e1 controlapi: add boxmodel to control/info?hwinfo
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3e8142fae
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- controlapi: add boxmodel to control/info?hwinfo

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-26 13:25:06 +01:00
vanhofen
224246aa56 neutrinoyparser: remove delivery_system from boxname
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4dc3fcbbd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: remove delivery_system from boxname

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-26 13:25:06 +01:00
vanhofen
6a9ec9da39 neutrinoyparser: add function 'get_boxmodel'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d81b50523c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: add function 'get_boxmodel'

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-26 13:25:06 +01:00
Jacek Jendrzej
6c41c1aa1d CControlAPI::EpgSearchXMLCGI convert channelname to xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e2e14e134
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-13 20:12:31 +01:00
Michael Liebmann
4abf2a80f8 yWeb: Synchronize volume/audiomute settings yWeb => GUI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-12 06:02:27 +01:00
vanhofen
c5f022fe75 CControlAPI: SignalInfoCGI: don't show description in explicit calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63d66538ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-10 (Mon, 10 Feb 2014)

Origin message was:
------------------
- CControlAPI: SignalInfoCGI: don't show description in explicit calls

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-10 21:50:34 +01:00
Jacek Jendrzej
b6e01fe87e CControlAPI:: -add SignalInfoCGI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d01e2152a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-10 21:14:54 +01:00
Jacek Jendrzej
8126ba13a5 webif standby -add option CEC standby off (dont use TV off)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-28 10:30:29 +01:00
Jacek Jendrzej
267405c5f7 supplement to e9643a6d05 cec option in standby off and on
Origin commit data
------------------
Branch: ni/coolstream
Commit: 372b367b8b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-27 20:26:46 +01:00
Jacek Jendrzej
e9643a6d05 add webif option dont use CEC with standbyoff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4be0273083
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)

Origin message was:
------------------
-add webif option dont use CEC with standbyoff

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-26 22:24:17 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Jacek Jendrzej
8c80942d01 CControlAPI::EpgSearchCGI add duration to txt output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59b3245680
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-18 20:17:24 +01:00
Jacek Jendrzej
acbb765586 CControlAPI:: epgsearchxml fix time format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f65005339
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-16 18:46:51 +01:00
Jacek Jendrzej
9ac0106bd4 CControlAPI:: -add epgsearchxml & epgsearch
Origin commit data
------------------
Branch: ni/coolstream
Commit: f373f621ef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-14 (Tue, 14 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-14 19:15:46 +01:00
Stefan Seyfried
a5feafa1b5 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
------------------
Branch: ni/coolstream
Commit: 07caa88ad2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-13 21:03:11 +01:00
Stefan Seyfried
26abd01822 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
------------------
Branch: ni/coolstream
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-13 20:57:40 +01:00
martii
d1ed51a228 nhttpd/controlapi: add mode=all to GetBouquetCGI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b730409ed
Author: martii <m4rtii@gmx.de>
Date: 2013-12-26 (Thu, 26 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +01:00
martii
6fa7c4f1d6 nhttpd/controlapi: GetBouquetsCGI: support "mode=all" (compiles, untested)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83534791ef
Author: martii <m4rtii@gmx.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +01:00
Jacek Jendrzej
8444bc6d2b CControlAPI::GetBouquetsCGI: -add TV/RADDIO mode selectable (THX martii)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0866bc65a7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-25 18:11:33 +01:00
vanhofen
669c1fc9bf yWeb: use same order in search for channellogos as neutrino
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-06 13:30:52 +01:00
Jacek Jendrzej
ced560668b CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG
Origin commit data
------------------
Branch: ni/coolstream
Commit: aaad29a245
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-05 15:42:50 +01:00
Michael Liebmann
ec6bf71c64 Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-17 04:22:49 +02:00
Jacek Jendrzej
6323734197 CControlAPI::GetBouquetCGI fix segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 733f7a5382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-12 22:01:17 +02:00
Jacek Jendrzej
345419d01f CControlAPI::EpgCGI fix control/epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03b7151563
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-12 21:39:41 +02:00
[CST] Focus
3137c4497c neutrino: add EAC3 audio support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e6276def7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-08 17:18:35 +04:00
vanhofen
40101950e4 controlapi: use rcsim.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c2fbf3348
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-04 (Fri, 04 Oct 2013)

Origin message was:
------------------
- controlapi: use rcsim.h

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-04 12:00:28 +02:00
Jacek Jendrzej
68696c85af CControlAPI::SendChannelList: show only unique channellist & currenttpchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d7751dc8c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-01 17:55:18 +02:00
vanhofen
dc660e7e7f yweb: fix /control/reboot
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5227f726c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)

Origin message was:
------------------
- yweb: fix /control/reboot

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-28 22:25:41 +02:00
[CST] Focus
afca303c15 nhttpd/tuxboxapi/coolstream/controlapi.cpp: wakeup zapit before neutrino,
to be sure zapit will process any next commands


Origin commit data
------------------
Branch: ni/coolstream
Commit: d26bc23f6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)



------------------
This commit was generated by Migit
2013-09-27 16:27:21 +04:00
[CST] Focus
aa8cce313d nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp: fix memleak in GetChannelEvents()
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2d5ccdce2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-25 17:08:34 +04:00
Jacek Jendrzej
226972c34c CControlAPI::_GetBouquetWriteItem: -fix UTF-8 (THX Gaucho316) http://www.dbox2world.net/index.php?page=Thread&postID=157423
Origin commit data
------------------
Branch: ni/coolstream
Commit: c06e0c4bb4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-24 12:39:54 +02:00
vanhofen
b5aa6b36b8 yweb: remove delivery_system from boxtype tank
and avoid duplicate code


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-09-20 13:36:42 +02:00
[CST] Focus
4b08171904 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
------------------
Branch: ni/coolstream
Commit: 2df40249d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)



------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04:00
vanhofen
81bb786c2f controlapi/yparser: detect new models tank and trinity
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-15 16:25:38 +02:00
vanhofen
c7d0ae03e4 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-08-09 11:04:26 +02:00
vanhofen
bbebbb9ac3 yweb: rework classifying slidertable in channellist for a smoother view
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-28 00:52:59 +02:00
vanhofen
b0f5491fb9 yweb: use more matching zee-remotecontrol for neo twin
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-13 11:43:40 +02:00
vanhofen
4befb00cfa yweb: add key 'sleep'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee4a4cbea1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-14 (Tue, 14 May 2013)

Origin message was:
------------------
- yweb: add key 'sleep'

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-14 22:40:49 +02:00
Stefan Seyfried
c7ae873506 nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db15cc630
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-08 10:02:33 +04:00
[CST] Focus
cf1edc9e64 remove 'coolstream' from gui
Origin commit data
------------------
Branch: ni/coolstream
Commit: cdf10ef46e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-22 (Fri, 22 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-22 10:52:39 +04:00
[CST] Focus
b2ea79a8aa nhttpd/tuxboxapi/coolstream/controlapi.cpp: create screenshot in sync mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 370e3dd690
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-19 17:24:09 +04:00
[CST] Focus
d0ccb2c97d Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
Stefan Seyfried
0e01a7b32c 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00