Commit Graph

576 Commits

Author SHA1 Message Date
vanhofen
9147358eef Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cd48bf48b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-12 (Mon, 12 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-12 10:45:25 +02:00
Jacek Jendrzej
d9224e1050 src/gui/movieplayer.cpp fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: cca6526b2f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-11 (Sun, 11 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-11 20:00:33 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
Michael Liebmann
e2b33894eb Merge branch 'pu/fb-setmode'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 14:18:01 +02:00
gixxpunk
079a23799e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c61674c425
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-31 (Wed, 31 May 2017)


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

------------------
This commit was generated by Migit
2017-05-31 10:22:31 +02:00
Jacek Jendrzej
28bcf2997e change prozent ckeck to 90
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab829a61b6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-30 (Tue, 30 May 2017)


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

------------------
This commit was generated by Migit
2017-05-30 19:26:04 +02:00
vanhofen
dd4501697b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



------------------
This commit was generated by Migit
2017-05-16 15:28:08 +02:00
vanhofen
4c2826f420 movieplayer: make bisection jump period configurable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e5cb286c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: make bisection jump period configurable

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

------------------
This commit was generated by Migit
2017-05-16 15:26:20 +02:00
vanhofen
cc0835b078 movieplayer: reduce timeout for bisectional jumps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0918616dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: reduce timeout for bisectional jumps

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

------------------
This commit was generated by Migit
2017-05-16 15:26:20 +02:00
vanhofen
5705809f1a movieplayer: allow bisectional jumps with RC_page_up/down
based upon code by TangoCash


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash


------------------
This commit was generated by Migit
2017-05-13 17:45:59 +02:00
vanhofen
cc75e46888 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b76adcc02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:50:19 +02:00
vanhofen
d766040099 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 16:23:25 +02:00
Jacek Jendrzej
06aef234de Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 020f044c07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 12:57:22 +02:00
Thilo Graf
c0babc0484 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07c72026ed
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 12:25:42 +02:00
Thilo Graf
11b4748125 movieplayer.cpp: prevent build error
Avoid build error if build not configured with -D__STDC_LIMIT_MACROS


Origin commit data
------------------
Branch: ni/coolstream
Commit: f1779d0a97
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 12:18:52 +02:00
Thilo Graf
e9e7ea72b8 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: e35acf2e2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 08:28:20 +02:00
Thilo Graf
1148afc62b movieplayer.cpp: remove possible compile issue
"__STDC_LIMIT_MACROS" redefined


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65b09044c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 08:26:14 +02:00
vanhofen
969d3331e4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-29 21:02:27 +02:00
vanhofen
1a928cce60 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)



------------------
This commit was generated by Migit
2017-03-29 08:05:10 +02:00
Michael Liebmann
3a34afe94e Fix videosystem auto mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b612c1f620
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
vanhofen
4a4762935b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)



------------------
This commit was generated by Migit
2017-03-26 23:25:43 +02:00
vanhofen
9a87ed41b1 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b10696bf2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-22 14:32:59 +01:00
Michael Liebmann
79b679a9ca Fix videosystem auto mode / osd mode switch in movie player
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a858c628a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-22 14:00:41 +01:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
b67a4fc3b3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 10:08:13 +01:00
Stefan Seyfried
587fa7d77a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 19:43:06 +01:00
Jacek Jendrzej
4c19475bd1 make neutrino compatible with new ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 15:00:17 +01:00
vanhofen
47ce01c2b5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dfac4d01dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:43:51 +01:00
vanhofen
09e19facfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:40:18 +01:00
vanhofen
6d8078cf73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 22:07:52 +01:00
Jacek Jendrzej
a3a0da0277 src/gui/movieplayer.cpp some streams need more time pro frame
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92abe90d58
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 14:41:25 +01:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
vanhofen
0e588328e0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-01 13:10:36 +01:00
vanhofen
9bd8b2b10c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
vanhofen
dff4ea2892 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c188cf3683
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)



------------------
This commit was generated by Migit
2017-02-26 22:35:47 +01:00
vanhofen
4ec9941db6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5442173af0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 22:31:40 +01:00
Jacek Jendrzej
1e00a117ad src/gui/movieplayer.cpp try fix stop play file on file end
Origin commit data
------------------
Branch: ni/coolstream
Commit: df25b50944
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-26 (Sun, 26 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 15:05:21 +01:00
Stefan Seyfried
4635eb375c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-22 08:44:53 +01:00
vanhofen
3b3c8d975b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:59 +01:00
vanhofen
7e6242f666 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:31 +01:00
Stefan Seyfried
90fa290ed5 libtuxtxt: remove unused fd parameter from tuxtx_main()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 418819e261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
vanhofen
7df8d3e4ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d894829c43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-19 23:35:31 +01:00
Stefan Seyfried
690f065e3f libtuxtxt: remove unused fd parameter from tuxtx_main()
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb3fa7f2af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-19 11:52:37 +01:00
vanhofen
886f9f4073 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c28991d0fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-17 (Fri, 17 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-17 17:44:29 +01:00
Jacek Jendrzej
b59d0fa8f9 try to fix segfault with --enable-cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: e908858c19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-17 12:11:03 +01:00
vanhofen
6bb52f0731 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 22:54:00 +01:00
vanhofen
5708ad998c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 21:52:59 +01:00
Stefan Seyfried
0e3ab5bce1 remove hardware specific code from gui
Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.

This needs testing on the affected hardware, which I do not have :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: c9e1072b94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
2017-02-14 20:01:55 +01:00