vanhofen
d34a956722
tuxtxt: change some default values
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
This should be bounded to current loacle settings.
Origin commit data
------------------
Commit: 9bf563c96c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-03 (Fri, 03 Nov 2017)
Origin message was:
------------------
- tuxtxt: change some default values
Signed-off-by: Thilo Graf <dbt@novatux.de >
This should be bounded to current loacle settings.
2017-11-16 19:43:25 +01:00
vanhofen
114e8f7b34
tuxtxt: fix compiler warnings; simplify ifdef's
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: abc2e90176
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-03 (Fri, 03 Nov 2017)
Origin message was:
------------------
- tuxtxt: fix compiler warnings; simplify ifdef's
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-11-16 19:43:25 +01:00
vanhofen
74ebecfcc7
tuxtxt: align to mp
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: e607bae240
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-03 (Fri, 03 Nov 2017)
Origin message was:
------------------
- tuxtxt: align to mp
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-11-16 19:43:25 +01:00
vanhofen
137d4c36a9
rename can_set_display_brightness => display_can_set_brightness
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 91fdb1ef6c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-01 (Wed, 01 Nov 2017)
Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-11-02 21:23:01 +01:00
vanhofen
868d95cea9
vfd-setup: use new display_can_deepstandby member from libstb-hal
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
Build was broken with original cherry-pick. hw_caps_t was incomplete.
Origin commit data
------------------
Commit: 674ba19c03
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-11-01 (Wed, 01 Nov 2017)
Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal
Signed-off-by: Thilo Graf <dbt@novatux.de >
Build was broken with original cherry-pick. hw_caps_t was incomplete.
2017-11-02 21:22:01 +01:00
Thilo Graf
59c07e5163
CScreenShot: fix build
...
Some lines were wrong picked
Origin commit data
------------------
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-27 (Fri, 27 Oct 2017)
2017-10-29 18:48:28 +01:00
vanhofen
284138fbc5
audio_select: copy full code from TangoCash
...
Just compile tested. Maybe some more alignments needed.
Signed-off-by: Thilo Graf <dbt@novatux.de >
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.
Signed-off-by: Thilo Graf <dbt@novatux.de >
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-29 18:32:30 +01:00
vanhofen
f8d931aad8
add hd51; mostly ported from TangoCash's neutrino-mp
...
Origin commit data
------------------
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-05 (Thu, 05 Oct 2017)
Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
2017-10-29 18:31:30 +01:00
Thilo Graf
63a19076c9
tuxtxt_common.h: add missing init to readcnt
...
Origin commit data
------------------
Commit: bfeb3c47ff
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-24 (Tue, 24 Oct 2017)
2017-10-29 18:31:13 +01:00
Jacek Jendrzej
041101db81
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-16 13:17:17 +02:00
Jacek Jendrzej
702fd00c19
Revert "- libdvbsub: add missing free() call"
...
This reverts commit 66906e96c2
.
Origin commit data
------------------
Commit: 0f8e614ee4
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-16 10:44:19 +02:00
vanhofen
66906e96c2
libdvbsub: add missing free() call
...
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 89f9ae85f0
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- libdvbsub: add missing free() call
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-13 12:35:59 +02:00
vanhofen
1cf144605f
libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()
...
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: fa0400f8b2
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-13 12:35:59 +02:00
gixxpunk
fa7f83028d
dvbsubtitle: fix copy/paste error and only show debug if there is something to clear
...
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 3edc365eab
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- dvbsubtitle: fix copy/paste error and only show debug if there is something to clear
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-13 12:35:59 +02:00
gixxpunk
f7f497b107
cleanup dvbsubtitle code
...
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 18699eaf41
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- cleanup dvbsubtitle code
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-13 12:35:59 +02:00
vanhofen
143152d536
libdvbsub: allow FullHD resolution dimensions
...
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 5ba719402a
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- libdvbsub: allow FullHD resolution dimensions
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-13 12:35:59 +02:00
vanhofen
f1dfad968c
libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again
...
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 8bdcfb263d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again
Signed-off-by: J. Krieg <bellum07@googlemail.com >
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-10-13 12:35:59 +02:00
Jacek Jendrzej
079772e63d
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 12:52:04 +02:00
Stefan Seyfried
d41f19b667
add comments to suppres -Wimplicit-fallthrough warnings
...
Origin commit data
------------------
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-09-23 (Sat, 23 Sep 2017)
2017-09-26 12:41:05 +02:00
Michael Liebmann
e137542efe
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:07:15 +02:00
Michael Liebmann
bae7c53f79
jsoncpp: update to current version 1.8.3
...
Origin commit data
------------------
Commit: 9f6e78974b
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:06:32 +02:00
Jacek Jendrzej
805ed42dc4
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:54:04 +02:00
Jacek Jendrzej
f05782514f
remove unused
...
Origin commit data
------------------
Commit: 97442240f8
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:29:47 +02:00
Jacek Jendrzej
c44f82f12a
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 13:40:40 +02:00
Jacek Jendrzej
b03ab5cb9e
remove double includes
...
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-08 (Fri, 08 Sep 2017)
2017-09-08 21:21:32 +02:00
Jacek Jendrzej
c066cf6bf2
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
96edd2f2c1
some inits and never read var
...
Origin commit data
------------------
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
a887d8b2e9
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 13:13:03 +02:00
vanhofen
cce5365b59
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: c307ed5b36
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-21 12:56:00 +02:00
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
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
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
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
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
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
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
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
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
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
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
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