Commit Graph

259 Commits

Author SHA1 Message Date
Michael Liebmann
65c4cfec97 Set correct path for /.version if TARGET_PREFIX is in use.
Origin commit data
------------------
Commit: 312a80bee9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-25 (Sun, 25 Sep 2016)
2016-10-01 11:47:59 +02:00
TangoCash
05e98f85b9 add autoAdjustToEPG to webif API
Origin commit data
------------------
Commit: 3f32350645
Author: TangoCash <eric@loxat.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
2016-09-26 13:04:48 +02:00
vanhofen
5223eb01dc tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()
Origin commit data
------------------
Commit: 3e283469db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()
2016-08-26 16:05:45 +02:00
vanhofen
55efa2e847 neutrinoyparser: move search for channellogos to neutrinoyparser
This is to respecting user's setting to use other channellogos for
WebIf. Now WebIf tries Tuxbox.LogosURL from nhttpd.conf first.

Controlapi ignores these setting and providing the default system
channelogos using NeutrinoAPI->getLogoFile().


Origin commit data
------------------
Commit: 7ac0ed9093
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- neutrinoyparser: move search for channellogos to neutrinoyparser

This is to respecting user's setting to use other channellogos for
WebIf. Now WebIf tries Tuxbox.LogosURL from nhttpd.conf first.

Controlapi ignores these setting and providing the default system
channelogos using NeutrinoAPI->getLogoFile().
2016-08-26 16:05:45 +02:00
TangoCash
796c4bf5ea fix xmltv channellogos
Origin commit data
------------------
Commit: 3f3ff32c86
Author: TangoCash <eric@loxat.de>
Date: 2016-08-25 (Thu, 25 Aug 2016)
2016-08-26 16:05:45 +02:00
martii
de29fd97eb nhttpd/neutrinoapi: fix getLogoFile()
Origin commit data
------------------
Commit: b66c1e9f0f
Author: martii <m4rtii@gmx.de>
Date: 2014-03-11 (Tue, 11 Mar 2014)
2016-08-26 16:05:45 +02:00
vanhofen
6398975e24 controlapi: remove unused variable outType from xmltv functions
Origin commit data
------------------
Commit: 7c47b1a2a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- controlapi: remove unused variable outType from xmltv functions
2016-08-23 15:39:09 +02:00
TangoCash
2891e335b1 controlapi: add xmltv support
Origin commit data
------------------
Commit: bdde716c4a
Author: TangoCash <eric@loxat.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- controlapi: add xmltv support
2016-08-23 14:26:24 +02:00
Jacek Jendrzej
ad4b6a897a nhttpd remove unused
Origin commit data
------------------
Commit: d139c1c8dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)
2016-05-11 13:01:08 +02:00
Jacek Jendrzej
11ff271a19 nhttpd use epg id to get events
Origin commit data
------------------
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)
2016-05-11 12:52:11 +02:00
vanhofen
0493e5c8f8 neutrinoyparser: try to fix nevis build
Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1
 BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2


Origin commit data
------------------
Commit: f764fe6c54
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-20 (Wed, 20 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: try to fix nevis build

Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1
   BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2
2016-04-20 08:26:40 +02:00
vanhofen
cf223099a7 neutrinoyparser: fix Trinity detection
Origin commit data
------------------
Commit: 5e6720a849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-19 (Tue, 19 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: fix Trinity detection
2016-04-19 13:24:12 +02:00
vanhofen
5942128c5b neutrinoyparser: add Link and Trinity Duo
Origin commit data
------------------
Commit: feae5aef97
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-04-19 (Tue, 19 Apr 2016)

Origin message was:
------------------
- neutrinoyparser: add Link and Trinity Duo
2016-04-19 13:10:48 +02:00
Jacek Jendrzej
0625fcb709 nhttpd: unused var and function
Origin commit data
------------------
Commit: 136955157d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
nhttpd: unused var and function
2016-03-19 16:13:56 +01:00
vanhofen
6f5e577c2c controlapi: use hh->SendResult() in new getMoviesCGI()
Origin commit data
------------------
Commit: c5f3531913
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
- controlapi: use hh->SendResult() in new getMoviesCGI()
2016-03-19 13:52:07 +01:00
vanhofen
dba4d0efc5 controlapi: whitespace cleanup; remove dup getSubdirectories()
Origin commit data
------------------
Commit: 2fd4d6c4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
- controlapi: whitespace cleanup; remove dup getSubdirectories()
2016-03-19 13:52:07 +01:00
Marc Szymkowiak
73f6e9df2a add getmovies control
Origin commit data
------------------
Commit: f323f61785
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)
2016-03-19 13:52:07 +01:00
Marc Szymkowiak
07ee447e97 remove unused vars in controlapi
Origin commit data
------------------
Commit: 5ac755f75c
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)
2016-03-19 13:52:07 +01:00
vanhofen
de7fd8bcde yWeb/neutrinoyparser: add icons for scrabled and webtv channels
Origin commit data
------------------
Commit: 129dacc912
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb/neutrinoyparser: add icons for scrabled and webtv channels
2016-03-14 21:55:45 +01:00
vanhofen
c1ab03bd44 yWeb: add link to get stream to channellist; thx to dasda
Origin commit data
------------------
Commit: 5f613b0b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- yWeb: add link to get stream to channellist; thx to dasda
2016-03-14 18:14:00 +01:00
vanhofen
6ad61a2b1b neutrinoyparser: smoother view in channellist; align icons right
Origin commit data
------------------
Commit: 4fd9c12aa9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-14 (Mon, 14 Mar 2016)

Origin message was:
------------------
- neutrinoyparser: smoother view in channellist; align icons right
2016-03-14 18:14:00 +01:00
Jacek Jendrzej
964e9042cb src/nhttpd/tuxboxapi/ fix AddressSanitizer: strcpy-param-overlap: memory ranges
Origin commit data
------------------
Commit: 0f2c2c7631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)
2016-03-12 18:55:53 +01:00
[CST] Focus
86c6632755 nhttpd: try to fix threaded nhttp crashes (again)
Origin commit data
------------------
Commit: 14a73c3b80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
2016-03-08 18:05:34 +03:00
vanhofen
b900b262fd partly revert af4c52f488922910431010030b08dde65de7e3ad; ...
... "copy event to prevent crash in multi-threaded mode"


Origin commit data
------------------
Commit: 9b64861912
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-06 (Sun, 06 Mar 2016)

Origin message was:
------------------
- partly revert af4c52f488922910431010030b08dde65de7e3ad; ...

... "copy event to prevent crash in multi-threaded mode"
2016-03-07 20:11:57 +01:00
Jacek Jendrzej
5b3b2b19c1 src/nhttpd/tuxboxapi/controlapi.cpp fix 64bit AddressSanitizer: heap-buffer-overflow
Origin commit data
------------------
Commit: 9fc9b228ed
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
2016-03-03 20:49:58 +01:00
[CST] Focus
c4a07ea711 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel
Origin commit data
------------------
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)
2016-03-02 14:30:51 +03:00
vanhofen
8c7d6db807 controlapi/getmode: allow to get channelsmode in all stb modes
Origin commit data
------------------
Commit: 6a38042071
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-01 (Tue, 01 Mar 2016)

Origin message was:
------------------
- controlapi/getmode: allow to get channelsmode in all stb modes
2016-03-01 10:01:35 +01:00
vanhofen
c3dc083199 controlapi/epg: resort order of items; last order brakes plugins
Origin commit data
------------------
Commit: dcec44b8d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-27 (Sat, 27 Feb 2016)

Origin message was:
------------------
- controlapi/epg: resort order of items; last order brakes plugins
2016-02-27 00:03:34 +01:00
vanhofen
d6fde778d8 controlapi/timer: fix json output
Origin commit data
------------------
Commit: 63333053f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-26 (Fri, 26 Feb 2016)

Origin message was:
------------------
- controlapi/timer: fix json output
2016-02-26 09:03:24 +01:00
vanhofen
02abb61969 controlapi/timer: allow json output
Origin commit data
------------------
Commit: 9615f547d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-25 (Thu, 25 Feb 2016)

Origin message was:
------------------
- controlapi/timer: allow json output
2016-02-25 15:35:27 +01:00
Jacek Jendrzej
987757d215 fix AddressSanitizer: strncpy-param-overlap: memory ranges
Origin commit data
------------------
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
2016-02-24 18:46:12 +01:00
vanhofen
64fdadc288 controlapi/epgsearch: fix display of eventid
Origin commit data
------------------
Commit: c6207d1cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/epgsearch: fix display of eventid
2016-02-24 16:45:52 +01:00
vanhofen
76497b73ff controlapi/epg: add fallback when no channel or bouquet is given
This function needs a fix, because "bouquetnr=all" breakes json output.


Origin commit data
------------------
Commit: 911f333a7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/epg: add fallback when no channel or bouquet is given

This function needs a fix, because "bouquetnr=all" breakes json output.
2016-02-24 16:45:52 +01:00
vanhofen
6731f49fd2 controlapi/getchannel: fix possible crash when channel = NULL
Origin commit data
------------------
Commit: 72cec30e97
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/getchannel: fix possible crash when channel = NULL
2016-02-24 16:45:52 +01:00
vanhofen
ce972b16b8 controlapi: add small documentations for new stuff
Origin commit data
------------------
Commit: 2d209a90d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add small documentations for new stuff
2016-02-24 14:38:25 +01:00
vanhofen
0a43f3f9a1 controlapi: add epginfo=false switch to epg output
Origin commit data
------------------
Commit: 3a94e620c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add epginfo=false switch to epg output
2016-02-24 13:52:23 +01:00
vanhofen
af4c52f488 controlapi: add /getchannel function to get infos about current channel.
- controlapi: copy event to prevent crash in multi-threaded mode


Origin commit data
------------------
Commit: e855ceef8e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add /getchannel function to get infos about current channel.

- controlapi: copy event to prevent crash in multi-threaded mode
2016-02-24 13:49:19 +01:00
vanhofen
5a00327ca2 controlapi: add /getchannelid function to get full id too
Origin commit data
------------------
Commit: 3ceaae4efb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi: add /getchannelid function to get full id too
2016-02-24 13:43:35 +01:00
vanhofen
5286a99f23 controlapi/logolist: use well-known tags for channelid's
Origin commit data
------------------
Commit: f7fefac508
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/logolist: use well-known tags for channelid's
2016-02-24 13:43:26 +01:00
vanhofen
b1fa8daf5e yhook: rename outCollection() => outObject() to be more json
Origin commit data
------------------
Commit: 69615480f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-23 (Tue, 23 Feb 2016)

Origin message was:
------------------
- yhook: rename outCollection() => outObject() to be more json
2016-02-23 14:56:52 +01:00
vanhofen
d608e92880 control/logolist: allow json/xml output
Origin commit data
------------------
Commit: 43bab4b534
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-23 (Tue, 23 Feb 2016)

Origin message was:
------------------
- control/logolist: allow json/xml output
2016-02-23 14:42:28 +01:00
vanhofen
4089d66866 control/epgsearch: use outSingle instead of direct WriteLn
Origin commit data
------------------
Commit: 3fd3f2ba1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- control/epgsearch: use outSingle instead of direct WriteLn
2016-02-22 23:56:08 +01:00
vanhofen
561fade8fe control/epgsearch: fix old plain text output
Origin commit data
------------------
Commit: f9ac2b32cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- control/epgsearch: fix old plain text output
2016-02-22 23:24:07 +01:00
[CST] Focus
0c73944b02 nhttpd/tuxboxapi/neutrinoyparser.cpp: copy event to prevent crash in multi-threaded mode
Origin commit data
------------------
Commit: 0f771856ab
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-22 (Mon, 22 Feb 2016)
2016-02-22 18:03:35 +03:00
vanhofen
dc1c789a0d controlapi/mod_yparse: avoid double code ...
... by moving functions to execute scripts to helpers.cpp|h
Change outType from ExecCGI to text/plain because all arguments
are passed to the script. So no format can be defined.


Origin commit data
------------------
Commit: b5e2998d54
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- controlapi/mod_yparse: avoid double code ...

... by moving functions to execute scripts to helpers.cpp|h
Change outType from ExecCGI to text/plain because all arguments
are passed to the script. So no format can be defined.
2016-02-22 14:15:02 +01:00
vanhofen
9c7e163c67 controlapi/getmode: get right mode; allow json/xml output
Origin commit data
------------------
Commit: 10252bd09c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi/getmode: get right mode; allow json/xml output
2016-02-22 01:18:48 +01:00
vanhofen
db95a61143 controlapi/statfs: remove unneccessary array from xml/json
Origin commit data
------------------
Commit: 5497621f4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi/statfs: remove unneccessary array from xml/json
2016-02-22 01:18:48 +01:00
vanhofen
f87f36b13b controlapi: use getOutType() function
Origin commit data
------------------
Commit: 7b1b9afba8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi: use getOutType() function
2016-02-22 01:18:48 +01:00
vanhofen
00774d8fde controlapi: reformat yCgiCallList
Origin commit data
------------------
Commit: ca34eadcf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi: reformat yCgiCallList
2016-02-21 20:20:23 +01:00
vanhofen
ae476ce195 yhook: remove unnecessary line feeds from plain output; ...
align control/getbouquet


Origin commit data
------------------
Commit: 89e0ba1a41
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- yhook: remove unnecessary line feeds from plain output; ...

align control/getbouquet
2016-02-21 01:55:32 +01:00