Commit Graph

276 Commits

Author SHA1 Message Date
Thilo Graf
a017c679dc neutrinoapi.cpp: fix possible broken build
error: ‘to_string’ was not declared...

to_string is handled inside helpers.h/cpp.
include of <system/helpers.h> is required here.


Origin commit data
------------------
Commit: f0891cb76f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 20:56:08 +02:00
TangoCash
20c1a160bc [RemoteTimers] add possibility to transfer all timers at once via webif
Use:
http://boxip/control/sendalltimers?ip=10.1.1.xxx&force=1
http://boxip/control/sendalltimers?name=record%20box&force=true

if parameter name is given, it has to be in timerlist as remote box.
if parameter ip and name is given, ip is used.
if parameter force is set, all checks are disabled, and the local timer
will be deleted even the transfer was not successful.


Origin commit data
------------------
Commit: 7031e99573
Author: TangoCash <eric@loxat.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 16:34:19 +02:00
vanhofen
3b3a096715 neutrinoyparser: remove workaround for Neo Twin
Origin commit data
------------------
Commit: 59adc88491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: remove workaround for Neo Twin
2017-03-19 01:04:48 +01:00
vanhofen
11240de06d controlapi: use "CST" instead of "Coolstream" ...
because I don't know the current legal situation.


Origin commit data
------------------
Commit: 9e5c30f754
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.
2017-03-19 01:04:48 +01:00
vanhofen
003c72673f neutrinoyparser: stay compatible with present code in Y_Blocks.txt
Origin commit data
------------------
Commit: 60d3cfb962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: stay compatible with present code in Y_Blocks.txt
2017-03-13 23:48:08 +01:00
vanhofen
4110492797 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
Origin commit data
------------------
Commit: 0203de264f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
2017-03-10 15:36:13 +01:00
vanhofen
a924473bb6 neutrinoyparser: use hw_caps in func_get_boxtype() ...
... and func_get_boxmodel()


Origin commit data
------------------
Commit: 305b1a6da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: use hw_caps in func_get_boxtype() ...

... and func_get_boxmodel()
2017-03-10 15:07:52 +01:00
vanhofen
26584b4308 controlapi: use hw_caps in HWInfoCGI()
Origin commit data
------------------
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()
2017-03-10 15:07:52 +01:00
vanhofen
7afeaefba4 controlapi: /control/info => return right name
Origin commit data
------------------
Commit: e092059f32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return right name
2017-03-10 15:07:52 +01:00
vanhofen
a9edf315db rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins
2017-03-01 13:03:50 +01:00
vanhofen
fbec2ca240 controlapi: fix perror message
Origin commit data
------------------
Commit: 7c2e25103f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- controlapi: fix perror message
2017-02-22 15:25:04 +01:00
Stefan Seyfried
ee9acfe1a4 remove unnecessary sectionsdclient.h includes
Origin commit data
------------------
Commit: c14c15ea24
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:48:35 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
Stefan Seyfried
7e35a8e7df neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Commit: ee5f73c64d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-13 01:43:37 +01:00
vanhofen
782052704c controlapi: fix compiler warning
error: declaration of 'channel_id' shadows a previous local


Origin commit data
------------------
Commit: 703caef3f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: fix compiler warning

error: declaration of 'channel_id' shadows a previous local
2016-11-09 17:13:43 +01:00
vanhofen
9bbf604d96 controlapi: add epg_id to several outputs; add /control/getepgid
* /control/getepgid[?format=plain|json|xml]


Origin commit data
------------------
Commit: 3150d9edac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)

Origin message was:
------------------
- controlapi: add epg_id to several outputs; add /control/getepgid

* /control/getepgid[?format=plain|json|xml]
2016-11-09 11:55:44 +01:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
2016-10-10 14:19:55 +02:00
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