Commit Graph

85 Commits

Author SHA1 Message Date
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
73da438ec4 Merge branch 'cst-next' into nmp-cst-next_test
Origin commit data
------------------
Branch: ni/coolstream
Commit: f162708f6a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-26 16:52:10 +02:00
vanhofen
8f2cbeb841 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29009126df
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-26 16:06:36 +02:00
vanhofen
3f71bf4b1f tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()
Origin commit data
------------------
Branch: ni/coolstream
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()

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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
TangoCash
58a479dc92 fix xmltv channellogos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f3ff32c86
Author: TangoCash <eric@loxat.de>
Date: 2016-08-25 (Thu, 25 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-26 16:05:45 +02:00
Michael Liebmann
0433da66aa Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ad46c5d9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-24 (Wed, 24 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-24 09:54:34 +02:00
vanhofen
f4009864bf Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: c2e4b979bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-23 15:40:06 +02:00
vanhofen
5490f62ef3 controlapi: remove unused variable outType from xmltv functions
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-08-23 15:39:09 +02:00
vanhofen
a0aa276626 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44851658cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-23 14:31:41 +02:00
TangoCash
518c0f534c controlapi: add xmltv support
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdde716c4a
Author: TangoCash <eric@loxat.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- controlapi: add xmltv support

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

------------------
This commit was generated by Migit
2016-08-23 14:26:24 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
8525df611a nhttpd use epg id to get events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)


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

------------------
This commit was generated by Migit
2016-05-11 12:52:11 +02:00
Jacek Jendrzej
bf98b30b00 nhttpd: unused var and function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 136955157d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
nhttpd: unused var and function

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

------------------
This commit was generated by Migit
2016-03-19 16:13:56 +01:00
vanhofen
209529ff95 controlapi: use hh->SendResult() in new getMoviesCGI()
Origin commit data
------------------
Branch: ni/coolstream
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()

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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
vanhofen
83eaedbabe controlapi: whitespace cleanup; remove dup getSubdirectories()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2fd4d6c4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-19 (Sat, 19 Mar 2016)

Origin message was:
------------------
- controlapi: whitespace cleanup; remove dup getSubdirectories()

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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
Ezak
ce666d4a81 add getmovies control
Origin commit data
------------------
Branch: ni/coolstream
Commit: f323f61785
Author: Ezak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)


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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
Ezak
e728c98c69 remove unused vars in controlapi
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ac755f75c
Author: Ezak <marc.szymkowiak91@googlemail.com>
Date: 2016-02-19 (Fri, 19 Feb 2016)


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

------------------
This commit was generated by Migit
2016-03-19 13:52:07 +01:00
Jacek Jendrzej
8d394d26cb src/nhttpd/tuxboxapi/ fix AddressSanitizer: strcpy-param-overlap: memory ranges
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2c2c7631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-12 18:55:53 +01:00
[CST] Focus
a5be5f3911 nhttpd: try to fix threaded nhttp crashes (again)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14a73c3b80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-08 18:05:34 +03:00
vanhofen
5f61df8be2 partly revert eda0c8dc4aec00181cc09f7769f5876b69422fda; ...
... "copy event to prevent crash in multi-threaded mode"


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

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

... "copy event to prevent crash in multi-threaded mode"


------------------
This commit was generated by Migit
2016-03-07 20:11:57 +01:00
Jacek Jendrzej
0d7818f01d src/nhttpd/tuxboxapi/controlapi.cpp fix 64bit AddressSanitizer: heap-buffer-overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fc9b228ed
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 20:49:58 +01:00
[CST] Focus
70ea917953 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-02 14:30:51 +03:00
vanhofen
d46725b9cc controlapi/getmode: allow to get channelsmode in all stb modes
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-03-01 10:01:35 +01:00
vanhofen
096952212b controlapi/epg: resort order of items; last order brakes plugins
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-27 00:03:34 +01:00
vanhofen
1891cb0dcd controlapi/timer: fix json output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63333053f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-26 (Fri, 26 Feb 2016)

Origin message was:
------------------
- controlapi/timer: fix json output

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

------------------
This commit was generated by Migit
2016-02-26 09:03:24 +01:00
vanhofen
ab706cfa38 controlapi/timer: allow json output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9615f547d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-25 (Thu, 25 Feb 2016)

Origin message was:
------------------
- controlapi/timer: allow json output

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

------------------
This commit was generated by Migit
2016-02-25 15:35:27 +01:00
Jacek Jendrzej
6cee2ec1cd fix AddressSanitizer: strncpy-param-overlap: memory ranges
Origin commit data
------------------
Branch: ni/coolstream
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-24 18:46:12 +01:00
vanhofen
7246bc9969 controlapi/epgsearch: fix display of eventid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6207d1cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/epgsearch: fix display of eventid

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

------------------
This commit was generated by Migit
2016-02-24 16:45:52 +01:00
vanhofen
72ca399341 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2016-02-24 16:45:52 +01:00
vanhofen
2c9f54f9b1 controlapi/getchannel: fix possible crash when channel = NULL
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-24 16:45:52 +01:00
vanhofen
5657ccffb3 controlapi: add small documentations for new stuff
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-24 14:38:25 +01:00
vanhofen
1b1aa29d80 controlapi: add epginfo=false switch to epg output
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-24 13:52:23 +01:00
vanhofen
eda0c8dc4a controlapi: add /getchannel function to get infos about current channel.
- controlapi: copy event to prevent crash in multi-threaded mode


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


------------------
This commit was generated by Migit
2016-02-24 13:49:19 +01:00
vanhofen
819a626b18 controlapi: add /getchannelid function to get full id too
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-24 13:43:35 +01:00
vanhofen
c3a6d8ffbb controlapi/logolist: use well-known tags for channelid's
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-24 13:43:26 +01:00
vanhofen
ffcf0fc8a3 yhook: rename outCollection() => outObject() to be more json
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-23 14:56:52 +01:00
vanhofen
473cc6afec control/logolist: allow json/xml output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bab4b534
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-23 (Tue, 23 Feb 2016)

Origin message was:
------------------
- control/logolist: allow json/xml output

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

------------------
This commit was generated by Migit
2016-02-23 14:42:28 +01:00
vanhofen
bb1e255f5c control/epgsearch: use outSingle instead of direct WriteLn
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-22 23:56:08 +01:00
vanhofen
bf20e185e6 control/epgsearch: fix old plain text output
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-22 23:24:07 +01:00
vanhofen
a9b725c9b5 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2016-02-22 14:15:02 +01:00
vanhofen
dbb4706326 controlapi/getmode: get right mode; allow json/xml output
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-22 01:18:48 +01:00
vanhofen
f327572416 controlapi/statfs: remove unneccessary array from xml/json
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-22 01:18:48 +01:00
vanhofen
744cd7a9a5 controlapi: use getOutType() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b1b9afba8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi: use getOutType() function

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

------------------
This commit was generated by Migit
2016-02-22 01:18:48 +01:00
vanhofen
92c84640d3 controlapi: reformat yCgiCallList
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca34eadcf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi: reformat yCgiCallList

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

------------------
This commit was generated by Migit
2016-02-21 20:20:23 +01:00
vanhofen
c140f3eff3 yhook: remove unnecessary line feeds from plain output; ...
align control/getbouquet


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


------------------
This commit was generated by Migit
2016-02-21 01:55:32 +01:00
vanhofen
7066330e0c controlapi: simplify result output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c73ca39e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi: simplify result output

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

------------------
This commit was generated by Migit
2016-02-21 00:16:42 +01:00
vanhofen
312afea2b8 controlapi/statfs: simplify error handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0927756467
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-20 (Sat, 20 Feb 2016)

Origin message was:
------------------
- controlapi/statfs: simplify error handling

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

------------------
This commit was generated by Migit
2016-02-20 23:10:17 +01:00
vanhofen
8f5399d2f4 controlapi/config: simplify error handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: e407ef5a98
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-20 (Sat, 20 Feb 2016)

Origin message was:
------------------
- controlapi/config: simplify error handling

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

------------------
This commit was generated by Migit
2016-02-20 23:08:41 +01:00
vanhofen
4475cde71a controlapi: rename EpgSearchTXTCGI -> EpgSearchCGI
Origin commit data
------------------
Branch: ni/coolstream
Commit: e765ab983b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-20 (Sat, 20 Feb 2016)

Origin message was:
------------------
- controlapi: rename EpgSearchTXTCGI -> EpgSearchCGI

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

------------------
This commit was generated by Migit
2016-02-20 20:56:15 +01:00