Commit Graph

377 Commits

Author SHA1 Message Date
martii
eb85bf0ad3 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


Origin commit data
------------------
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)
2014-09-24 19:50:35 +04:00
Benny
489b7b2ba3 add localization tag for time elapsed/remaining
Origin commit data
------------------
Commit: 0f16c9441e
Author: Benny <Benny@users.noreply.github.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
2014-09-23 12:46:40 +02:00
martii
1611d6229c nhttpd: disable range handling for cached content
Origin commit data
------------------
Commit: ee1ab08bd4
Author: martii <m4rtii@gmx.de>
Date: 2014-09-23 (Tue, 23 Sep 2014)
2014-09-23 11:45:59 +02:00
vanhofen
c85a6c1948 Revert "- yWeb: disable threading; there's something to fix"
This reverts commit 06a10b8bb4.


Origin commit data
------------------
Commit: 7ff097d842
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-23 (Tue, 23 Sep 2014)
2014-09-23 11:45:06 +02:00
martii
85493f86b6 driver/pictureviewer/jpeg: remove server-based rescaling code
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: a99e8df965
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)
2014-09-15 17:28:39 +04:00
Jacek Jendrzej
dde39896a2 yWeb: set RangeEnd
Origin commit data
------------------
Commit: 38bdf512b0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-30 (Sat, 30 Aug 2014)

Origin message was:
------------------
- yWeb: set RangeEnd
2014-08-30 14:45:05 +02:00
vanhofen
06a10b8bb4 yWeb: disable threading; there's something to fix
Origin commit data
------------------
Commit: 91d0f106b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-30 (Sat, 30 Aug 2014)

Origin message was:
------------------
- yWeb: disable threading; there's something to fix
2014-08-30 14:07:23 +02:00
vanhofen
4ed6cc8a3e yWeb: try to fix empty pages
Origin commit data
------------------
Commit: 270e915954
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-30 (Sat, 30 Aug 2014)

Origin message was:
------------------
- yWeb: try to fix empty pages
2014-08-30 14:07:10 +02:00
[CST] Focus
8f7f3f9e4d webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
2014-08-27 17:32:26 +04:00
vanhofen
198a7a2ad4 yWeb: link extention to new cst-public-gui-yweb.git repository
NOTE: When you got e file called /var/tuxbox/config/extentions.txt
with a line inside starting with "type:u,site:yjogol" then you'll
have to replace this one line with:
type:u,site:CST-git,desc:yWeb updates,url:http://git.coolstreamtech.de/?p=cst-public-gui-yweb.git;a=blob_plain;hb=refs/heads/master;f=Y_Extentions.txt


Origin commit data
------------------
Commit: 7f9eb5760c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- yWeb: link extention to new cst-public-gui-yweb.git repository

NOTE: When you got e file called /var/tuxbox/config/extentions.txt
with a line inside starting with "type:u,site:yjogol" then you'll
have to replace this one line with:
type:u,site:CST-git,desc:yWeb updates,url:http://git.coolstreamtech.de/?p=cst-public-gui-yweb.git;a=blob_plain;hb=refs/heads/master;f=Y_Extentions.txt
2014-08-26 17:33:14 +04:00
vanhofen
fcf09a2948 yWeb: remove some links to yjogol.com; site is down
TODO: Y_Tools_Check_Install.yhtm


Origin commit data
------------------
Commit: 0f3a81a028
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- yWeb: remove some links to yjogol.com; site is down

TODO: Y_Tools_Check_Install.yhtm
2014-08-26 17:33:07 +04:00
vanhofen
f522bf6534 yWeb: add hddtools extention source
Origin commit data
------------------
Commit: 6a694cc029
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- yWeb: add hddtools extention source
2014-08-26 17:33:01 +04:00
vanhofen
f11c2857c6 yWeb: add filemanager extention source
Origin commit data
------------------
Commit: 2b1933f5f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- yWeb: add filemanager extention source
2014-08-26 17:32:56 +04:00
vanhofen
7b1fc2e5d4 yWeb: add boxinfo extention source
Origin commit data
------------------
Commit: 54ac45384a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- yWeb: add boxinfo extention source
2014-08-26 17:32:51 +04:00
vanhofen
b86b1cb01f nhttp: enable threading
This is ported from neutrino-mp and contains code by martii and seife
from following commits:
20d3031b8bb47b5af79bf10c385e3564fe5c26dc
93d01c1987726c6ab344f69f799df03d5af8fe7a
363633dc1b9a508e244c7e1e51f6c1bbe699961c
c3e1310a2f727e26ce11669e3aeae78305f87049


Origin commit data
------------------
Commit: 7589a3a9e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)

Origin message was:
------------------
- nhttp: enable threading

This is ported from neutrino-mp and contains code by martii and seife
from following commits:
20d3031b8bb47b5af79bf10c385e3564fe5c26dc
93d01c1987726c6ab344f69f799df03d5af8fe7a
363633dc1b9a508e244c7e1e51f6c1bbe699961c
c3e1310a2f727e26ce11669e3aeae78305f87049
2014-08-26 17:32:46 +04:00
vanhofen
f9a01915b4 nhttp: some minor code optimizations
Origin commit data
------------------
Commit: 2c3952cf42
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)

Origin message was:
------------------
- nhttp: some minor code optimizations
2014-08-26 17:32:11 +04:00
martii
5a7dfcb2a4 nhttpd: extend sendfile mime types (untested)
Origin commit data
------------------
Commit: 25c8b3099c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-24 (Thu, 24 Jul 2014)
2014-08-26 17:32:06 +04:00
martii
cef6d2274d nhttpd: fix range handling
Origin commit data
------------------
Commit: 4bf0d833cd
Author: martii <m4rtii@gmx.de>
Date: 2014-07-24 (Thu, 24 Jul 2014)
2014-08-26 17:32:01 +04:00
martii
d865e7d9a9 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
------------------
Commit: ff46970457
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)
2014-08-26 17:31:57 +04:00
Jacek Jendrzej
2c6a4d3885 Revert "nhttpd: let sendfile() support files >= 2GB"
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.


Origin commit data
------------------
Commit: cf0bf3fa20
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)
2014-08-26 17:31:48 +04:00
martii
2b12212bdc nhttpd: let sendfile() support files >= 2GB
Origin commit data
------------------
Commit: d71958ba8c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)
2014-08-26 17:31:22 +04:00
vanhofen
aac81d2063 yWeb: show correct RCU at Zee²
Origin commit data
------------------
Commit: bf42b7c4cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)

Origin message was:
------------------
- yWeb: show correct RCU at Zee²
2014-06-27 10:43:25 +02:00
vanhofen
ca1ed61dbc neutrinoyparser: detect Zee²; fix Boxmodel for Trinity
Origin commit data
------------------
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
2014-06-27 10:41:01 +02:00
vanhofen
84c44ebaee yWeb: fix MODE_RADIO/MODE keys in RCUs
Origin commit data
------------------
Commit: c853231b1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-19 (Thu, 19 Jun 2014)

Origin message was:
------------------
- yWeb: fix MODE_RADIO/MODE keys in RCUs
2014-06-20 14:35:17 +02:00
[CST] Focus
b8241af4df fix warnings if some want to use c++11
Origin commit data
------------------
Commit: c78676f7fd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-17 (Thu, 17 Apr 2014)
2014-04-21 14:07:38 +04:00
Jacek Jendrzej
4f228f6519 make info copy only in timeshift mode
Origin commit data
------------------
Commit: 1bbf65c2d3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-20 (Sun, 20 Apr 2014)

Origin message was:
------------------
 make info copy only in timeshift mode
2014-04-20 21:03:21 +02:00
Jacek Jendrzej
4f4bd6eb1e nhttpd: -add Chech by marsim21
Origin commit data
------------------
Commit: cb8a3c5518
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-20 (Sun, 20 Apr 2014)
2014-04-20 18:30:54 +02:00
Jacek Jendrzej
48e581a94c yWeb: dont zap on channel change
Origin commit data
------------------
Commit: 74e1cb7f14
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
2014-04-09 17:02:05 +02:00
vanhofen
3fb13f1d28 yWeb: scale channellogos in channellist and epg plus
Origin commit data
------------------
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
2014-04-01 17:59:04 +02:00
vanhofen
688f35d2f9 controlapi: add boxmodel to control/info?hwinfo
Origin commit data
------------------
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
2014-03-26 13:25:06 +01:00
vanhofen
733e27a624 neutrinoyparser: remove delivery_system from boxname
Origin commit data
------------------
Commit: d4dc3fcbbd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: remove delivery_system from boxname
2014-03-26 13:25:06 +01:00
vanhofen
d6653c336d neutrinoyparser: add function 'get_boxmodel'
Origin commit data
------------------
Commit: d81b50523c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: add function 'get_boxmodel'
2014-03-26 13:25:06 +01:00
Michael Liebmann
5aed2cea43 Update slovak.locle (THX EnoSat)
Origin commit data
------------------
Commit: c42de5f827
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-02-22 15:48:41 +01:00
Jacek Jendrzej
746c78cb4e CControlAPI::EpgSearchXMLCGI convert channelname to xml
Origin commit data
------------------
Commit: 1e2e14e134
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)
2014-02-13 20:12:31 +01:00
vanhofen
3375b332d5 doc controlapi: add documentation for '/control/signal'
Origin commit data
------------------
Commit: 8b28d38cea
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-12 (Wed, 12 Feb 2014)

Origin message was:
------------------
- doc controlapi: add documentation for '/control/signal'
2014-02-12 13:29:26 +01:00
vanhofen
7ab316f72e yWeb: add signal strength to boxcontrol menu
Origin commit data
------------------
Commit: b1bfe94a6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-12 (Wed, 12 Feb 2014)

Origin message was:
------------------
- yWeb: add signal strength to boxcontrol menu
2014-02-12 08:59:39 +01:00
vanhofen
35fd0b2d83 yWeb: increase version by counting commits since last increase
Origin commit data
------------------
Commit: 2c4b12508a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-12 (Wed, 12 Feb 2014)

Origin message was:
------------------
- yWeb: increase version by counting commits since last increase
2014-02-12 08:50:19 +01:00
Michael Liebmann
308c8ce00a yWeb: Synchronize volume/audiomute settings yWeb => GUI
Origin commit data
------------------
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
2014-02-12 06:02:27 +01:00
vanhofen
9d5762395e CControlAPI: SignalInfoCGI: don't show description in explicit calls
Origin commit data
------------------
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
2014-02-10 21:50:34 +01:00
Jacek Jendrzej
bd5e6f5ec6 CControlAPI:: -add SignalInfoCGI
Origin commit data
------------------
Commit: 8d01e2152a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)
2014-02-10 21:14:54 +01:00
vanhofen
281a9fc779 yWeb: add CEC option to standby switches
Origin commit data
------------------
Commit: 19593d5c6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-10 (Mon, 10 Feb 2014)

Origin message was:
------------------
- yWeb: add CEC option to standby switches
2014-02-10 21:02:10 +01:00
vanhofen
1e1122f44d yWeb: fix typo; THX to TheDuke
Origin commit data
------------------
Commit: c52b66068f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-08 (Sat, 08 Feb 2014)

Origin message was:
------------------
- yWeb: fix typo; THX to TheDuke
2014-02-08 22:40:22 +01:00
Jacek Jendrzej
5b91bb9e46 webif standby -add option CEC standby off (dont use TV off)
Origin commit data
------------------
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
2014-01-28 10:30:29 +01:00
Jacek Jendrzej
67eac1e2c5 supplement to ac3ee0cf9b cec option in standby off and on
Origin commit data
------------------
Commit: 372b367b8b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
2014-01-27 20:26:46 +01:00
Jacek Jendrzej
ac3ee0cf9b add webif option dont use CEC with standbyoff
Origin commit data
------------------
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
2014-01-26 22:24:17 +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
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