mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
16,110 Commits 2 Branches 9 Tags
caef1eb2bc6f7a2db8afcc85d0f96b22733cbc57
Commit Graph

785 Commits

Author SHA1 Message Date
Jacek Jendrzej
f9a565da5d part from c2095e1759 
Origin commit data
------------------
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 10:57:18 +02:00
Stefan Seyfried
32b8b3b54f Revert "- hardware_caps: fix has_fan and add detection of Neo Twin" 
This reverts commit ee911957d4.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Commit: e2db590797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
 2017-08-21 10:17:05 +02:00
Stefan Seyfried
a344d17c0e Revert "- hardware_caps: fix has_fan and add detection of Neo Twin" 
This reverts commit ee911957d4.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Commit: 009838b977
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
 2017-08-20 16:19:57 +02:00
vanhofen
c2095e1759 hw_caps: remove CFEManager-code; ... 
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Commit: 382181e289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start
 2017-08-14 10:56:45 +02:00
vanhofen
99901ced0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6f8b855b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
 2017-06-30 14:41:42 +02:00
gixxpunk
c2a2ab7509 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
 2017-06-29 21:29:56 +02:00
Michael Liebmann
043e374b4a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
 2017-06-29 15:06:39 +02:00
Michael Liebmann
3c32edae9d lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to d6b7d95 
Origin commit data
------------------
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
 2017-06-29 15:05:30 +02:00
vanhofen
c8cba2e151 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:51:58 +02:00
vanhofen
d4545b0abd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:51:16 +02:00
Jacek Jendrzej
e26b8378e6 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:22:07 +02:00
Jacek Jendrzej
d6b7d95600 lib/libtuxtxt/tuxtxt.cpp avoid segfault, FIXME 
Origin commit data
------------------
Commit: 7aec84d124
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 11:53:59 +02:00
Jacek Jendrzej
7cf343f927 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 12:21:18 +02:00
vanhofen
7a7aeb8aa6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/audioplayer.cpp


Origin commit data
------------------
Commit: 197dfd1c41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:58:47 +02:00
Michael Liebmann
606abfa9ce Revert "HD1: Workaround for missing cs_get_chip_type" 
This reverts commit eac2dccfb6.


Origin commit data
------------------
Commit: e3cc6cee67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 19:33:29 +02:00
vanhofen
c8faf0ce1e libdvbsub: add missing free() call 
Origin commit data
------------------
Commit: 1900bd12b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: add missing free() call
 2017-06-16 18:22:19 +02:00
vanhofen
e68ac154c8 libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB() 
Origin commit data
------------------
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()
 2017-06-16 15:53:55 +02:00
gixxpunk
b4b214ca6c dvbsubtitle: fix copy/pasta error and only show debug if there is something to clear 
Origin commit data
------------------
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
 2017-06-16 15:13:54 +02:00
vanhofen
d039206edd libdvbsub: align to ni/tuxbox branch 
Origin commit data
------------------
Commit: 1d08f2bd5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: align to ni/tuxbox branch
 2017-06-16 15:12:51 +02:00
gixxpunk
264cc2c539 dvbsub: enable debug output for testing 
Origin commit data
------------------
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
 2017-06-16 15:11:48 +02:00
gixxpunk
64040a62c3 cleanup dvbsubtitle code 
Origin commit data
------------------
Commit: f3f645e34d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- cleanup dvbsubtitle code
 2017-06-16 15:10:44 +02:00
vanhofen
61d41d0862 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
------------------
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 15:10:34 +02:00
vanhofen
17793da1f5 libdvbsub: allow FullHD resolution dimensions 
Origin commit data
------------------
Commit: 31918aefff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: allow FullHD resolution dimensions
 2017-06-16 11:40:17 +02:00
vanhofen
422eb6110f libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again 
Origin commit data
------------------
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
 2017-06-16 11:10:31 +02:00
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 12:32:31 +02:00
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 11:07:32 +02:00
vanhofen
93b1e05e4a 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
------------------
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>
 2017-06-15 01:01:55 +02:00
vanhofen
45392dd9cd 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
------------------
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.
 2017-06-12 13:14:32 +02:00
vanhofen
2deb414738 Revert "HD1: Workaround for missing cs_get_chip_type" 
This reverts commit eac2dccfb6.


Origin commit data
------------------
Commit: 54d7350a11
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 23:38:40 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
vanhofen
5a9e9904a7 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
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 15:14:51 +02:00
Michael Liebmann
9767657185 Merge branch 'pu/fb-setmode' 
Origin commit data
------------------
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:18:01 +02:00
Michael Liebmann
eac2dccfb6 HD1: Workaround for missing cs_get_chip_type 
Origin commit data
------------------
Commit: a6fe60d60a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:16:11 +02:00
vanhofen
11bf56675a Revert "HD1 compat #1; master" 
This reverts commit 15e77032a8.


Origin commit data
------------------
Commit: ebc3ce2e43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:47:51 +02:00
Michael Liebmann
15e77032a8 HD1 compat #1; master 
Origin commit data
------------------
Commit: db9d1599ea
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)
 2017-05-08 16:39:16 +02:00
vanhofen
d4196e101f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 14:02:32 +02:00
gixxpunk
c4f66cd900 Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
 2017-04-26 11:17:46 +02:00
Jacek Jendrzej
1eff142af8 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 3fe94beaa4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-24 22:39:33 +02:00
Michael Liebmann
c46c50d1b7 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 1852183fa6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-24 22:35:45 +02:00
Michael Liebmann
3059a4b6d9 lib/libtuxtxt/Makefile.am: Fix FREETYPE_CFLAGS 
Origin commit data
------------------
Commit: 6a08685b57
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-24 22:34:51 +02:00
Stefan Seyfried
1ca25cd8ff Merge remote-tracking branch 'tuxbox/master' 
only compile-tested


Origin commit data
------------------
Commit: 19c149c48a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)
 2017-04-10 18:27:09 +02:00
vanhofen
3496122f93 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 404e609553
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)
 2017-03-31 17:41:29 +02:00
vanhofen
bb03a67aa7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 21:02:27 +02:00
vanhofen
dd6d985e19 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
------------------
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 08:05:10 +02:00
Michael Liebmann
e441a3738b lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2 
Origin commit data
------------------
Commit: 9e08f4cb92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 23:56:57 +02:00
Michael Liebmann
8722e86ded Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 5e00bc5b4c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 21:54:01 +02:00
vanhofen
ff13f412b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: be308c82f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 21:29:30 +02:00
vanhofen
2dc624e4ef Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b4adf56866
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 21:28:54 +02:00
vanhofen
2f636cd9f3 jsoncpp: update to current version 1.8.0 
Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
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
 2017-03-28 21:23:10 +02:00
vanhofen
3330ef5730 Revert "- jsoncpp: update to current version 1.8.0; align Makefile.am" 
This reverts commit cb47862c9c, because
some people has build-problems.


Origin commit data
------------------
Commit: 78e519f694
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 21:10:27 +02:00