Commit Graph

730 Commits

Author SHA1 Message Date
gixxpunk
4c908eafae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 21:29:56 +02:00
Michael Liebmann
dbb1faf69d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:06:39 +02:00
Michael Liebmann
8d1a669301 lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to 6771de1
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:05:30 +02:00
vanhofen
72745a089b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:51:58 +02:00
vanhofen
144725ebcd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:51:16 +02:00
Jacek Jendrzej
ea4ea34255 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:22:07 +02:00
Jacek Jendrzej
6771de1f2d lib/libtuxtxt/tuxtxt.cpp avoid segfault, FIXME
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7aec84d124
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 11:53:59 +02:00
Jacek Jendrzej
80eba228d6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 12:21:18 +02:00
vanhofen
57b326e0ef Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/audioplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 197dfd1c41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)



------------------
This commit was generated by Migit
2017-06-18 00:58:47 +02:00
Michael Liebmann
909cf0482d Revert "HD1: Workaround for missing cs_get_chip_type"
This reverts commit f273871fcf.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e3cc6cee67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)



------------------
This commit was generated by Migit
2017-06-16 19:33:29 +02:00
vanhofen
30019efc45 libdvbsub: add missing free() call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1900bd12b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: add missing free() call

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

------------------
This commit was generated by Migit
2017-06-16 18:22:19 +02:00
vanhofen
8281623a5f libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25a76044fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()

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

------------------
This commit was generated by Migit
2017-06-16 15:53:55 +02:00
gixxpunk
b58e89b3a8 dvbsubtitle: fix copy/pasta error and only show debug if there is something to clear
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0076127f8e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- dvbsubtitle: fix copy/pasta error and only show debug if there is something to clear

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

------------------
This commit was generated by Migit
2017-06-16 15:13:54 +02:00
vanhofen
99557d6b5d libdvbsub: align to ni/tuxbox branch
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d08f2bd5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: align to ni/tuxbox branch

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

------------------
This commit was generated by Migit
2017-06-16 15:12:51 +02:00
gixxpunk
1d9619ee02 dvbsub: enable debug output for testing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76d99beff7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- dvbsub: enable debug output for testing

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

------------------
This commit was generated by Migit
2017-06-16 15:11:48 +02:00
gixxpunk
cdeed225aa cleanup dvbsubtitle code
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3f645e34d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- cleanup dvbsubtitle code

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

------------------
This commit was generated by Migit
2017-06-16 15:10:44 +02:00
vanhofen
a567246e27 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)



------------------
This commit was generated by Migit
2017-06-16 15:10:34 +02:00
vanhofen
f3aff51dc1 libdvbsub: allow FullHD resolution dimensions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31918aefff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: allow FullHD resolution dimensions

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

------------------
This commit was generated by Migit
2017-06-16 11:40:17 +02:00
vanhofen
afc4d55652 libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8cb54f4922
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again

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

------------------
This commit was generated by Migit
2017-06-16 11:10:31 +02:00
Jacek Jendrzej
61a0924ac6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 12:32:31 +02:00
vanhofen
faa10f0ed6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 11:07:32 +02:00
vanhofen
9d69ed31b0 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4295839526
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
e4f4307eb6 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.


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

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.


------------------
This commit was generated by Migit
2017-06-12 13:14:32 +02:00
vanhofen
4b2d0d89af Revert "HD1: Workaround for missing cs_get_chip_type"
This reverts commit f273871fcf.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54d7350a11
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 23:38:40 +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
vanhofen
48db0bd94c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 15:14:51 +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
Michael Liebmann
f273871fcf HD1: Workaround for missing cs_get_chip_type
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6fe60d60a
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:16:11 +02:00
vanhofen
6184ac5eea Revert "HD1 compat #1; master"
This reverts commit c67039135f.


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



------------------
This commit was generated by Migit
2017-05-08 23:47:51 +02:00
Michael Liebmann
c67039135f HD1 compat #1; master
Origin commit data
------------------
Branch: ni/coolstream
Commit: db9d1599ea
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 16:39:16 +02:00
vanhofen
8af0c9668b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:02:32 +02:00
gixxpunk
3ace53ce3e Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-26 11:17:46 +02:00
Jacek Jendrzej
0256d5c45a Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fe94beaa4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 22:39:33 +02:00
Michael Liebmann
fddb8f5760 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1852183fa6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 22:35:45 +02:00
Michael Liebmann
72ac3f9fd4 lib/libtuxtxt/Makefile.am: Fix FREETYPE_CFLAGS
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a08685b57
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 22:34:51 +02:00
Stefan Seyfried
871e598afe Merge remote-tracking branch 'tuxbox/master'
only compile-tested


Origin commit data
------------------
Branch: ni/coolstream
Commit: 19c149c48a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)



------------------
This commit was generated by Migit
2017-04-10 18:27:09 +02:00
vanhofen
6dcbf7453b Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 404e609553
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:41:29 +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
6823a03aa4 lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e08f4cb92
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
Michael Liebmann
55713c92e3 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e00bc5b4c
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 21:54:01 +02:00
vanhofen
e309b99543 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: be308c82f8
Author: vanhofen <vanhofen@gmx.de>
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 21:29:30 +02:00
vanhofen
f867d99444 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4adf56866
Author: vanhofen <vanhofen@gmx.de>
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 21:28:54 +02:00
vanhofen
99b8e43a28 jsoncpp: update to current version 1.8.0
Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


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

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0

Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 21:23:10 +02:00
vanhofen
d1bc7c4e6a Revert "- jsoncpp: update to current version 1.8.0; align Makefile.am"
This reverts commit fa69b2e2ba, because
some people has build-problems.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 78e519f694
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 21:10:27 +02:00
vanhofen
9066eb8f9b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f12bec56c1
Author: vanhofen <vanhofen@gmx.de>
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 12:45:42 +02:00
vanhofen
4c98def5df Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef5217fd6f
Author: vanhofen <vanhofen@gmx.de>
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 11:35:23 +02:00
vanhofen
fa69b2e2ba jsoncpp: update to current version 1.8.0; align Makefile.am
Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 760a64fc6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0; align Makefile.am

Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 11:22:41 +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
4ce21cbc1d Merge branch 'master' into pu/mp
Conflicts:
	acinclude.m4


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



------------------
This commit was generated by Migit
2017-03-22 12:16:01 +01:00