682 Commits

Author SHA1 Message Date
M. Liebmann
a6fe60d60a HD1: Workaround for missing cs_get_chip_type 2017-06-07 14:16:11 +02:00
Jacek Jendrzej
3fe94beaa4 Merge branch 'master' into pu/mp 2017-04-24 22:39:33 +02:00
M. Liebmann
1852183fa6 Merge branch 'master' into pu/fb-setmode 2017-04-24 22:35:45 +02:00
M. Liebmann
6a08685b57 lib/libtuxtxt/Makefile.am: Fix FREETYPE_CFLAGS 2017-04-24 22:34:51 +02:00
svenhoefer
404e609553 Merge branch 'master' into pu/mp 2017-03-31 17:41:29 +02:00
M. Liebmann
9e08f4cb92 lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2 2017-03-28 23:56:57 +02:00
M. Liebmann
5e00bc5b4c Merge branch 'master' into pu/fb-setmode 2017-03-28 21:54:01 +02:00
svenhoefer
b945336a79 - 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
svenhoefer
78e519f694 Revert "- jsoncpp: update to current version 1.8.0; align Makefile.am"
This reverts commit 760a64fc6a, because
some people has build-problems.
2017-03-28 21:10:27 +02:00
svenhoefer
760a64fc6a - 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
2017-03-28 11:22:41 +02:00
svenhoefer
b1ba85c8c1 Merge branch 'master' into pu/mp
Conflicts:
	acinclude.m4
2017-03-22 12:16:01 +01:00
M. Liebmann
0cac85205b Merge branch 'master' into pu/fb-setmode 2017-03-22 01:24:03 +01:00
M. Liebmann
9bc2d9b95e hd[1|2]/libcoolstream: Update headers for new libcoolstream functions
libcoolstream-mt.so version 3.2.0 required

  Functions:
    - updateOsdScreenInfo()
    - GetVideoSystem()
    - GetVideoSystemFormatName()
    - fbCopy()
    - fbFill()
    - cs_set_extra_debug()
2017-03-22 01:23:45 +01:00
svenhoefer
b12624d1fa Merge branch 'master' into pu/mp
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
2017-03-20 01:31:51 +01:00
M. Liebmann
2ca9d9c4f9 Merge branch 'master' into pu/fb-setmode 2017-03-19 08:38:15 +01:00
svenhoefer
c225c2d4b6 - hardware_caps: fix has_fan and add detection of Neo Twin 2017-03-19 01:04:48 +01:00
svenhoefer
8bdb16cec6 Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
2017-03-13 16:14:33 +01:00
M. Liebmann
87cb1b514a Merge branch 'master' into pu/fb-setmode 2017-03-10 15:38:15 +01:00
svenhoefer
ff6046bb56 - hardware_caps: just changes in comments 2017-03-10 15:07:52 +01:00
svenhoefer
24b159f84c - hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines 2017-03-10 15:07:52 +01:00
svenhoefer
7cca1e02c3 - hardware_caps: use define instead of value; better readability 2017-03-10 15:07:52 +01:00
svenhoefer
83de4ba055 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()"
This reverts commit f5cdaff282
because libcoolstream now is updated
2017-03-10 15:07:52 +01:00
M. Liebmann
5e09df1d91 Merge branch 'master' into pu/fb-setmode 2017-03-10 14:50:04 +01:00
M. Liebmann
ab6ca5b606 hd2/libcoolstream/*.h: Update for new libcoolstream functions
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - Add CS_CHIP_NEVIS definitions
2017-03-10 14:35:32 +01:00
M. Liebmann
7eecd09eca hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - cs_get_chip_type() (dummy function for compatibility with hd2)
 - Add CS_CHIP_xxx definitions
2017-03-10 14:35:32 +01:00
M. Liebmann
fee5cd0175 Merge branch 'master' into pu/fb-setmode 2017-03-09 17:34:42 +01:00
M. Liebmann
f5cdaff282 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type() 2017-03-09 17:34:25 +01:00
M. Liebmann
94492c4271 Merge branch 'master' into pu/fb-setmode 2017-03-09 15:17:25 +01:00
svenhoefer
b546ed517e - hardware_caps: add latest coolstream models 2017-03-09 12:51:44 +01:00
M. Liebmann
7ad59776d1 Merge branch 'master' into pu/fb-setmode 2017-03-08 00:35:16 +01:00
Stefan Seyfried
6f1cfd42bb Merge remote-tracking branch 'tuxbox/master' 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
bfa589eb08 make neutrino compatible with new ffmpeg 2017-03-07 15:00:17 +01:00
M. Liebmann
bab10ee438 Merge branch 'master' into pu/fb-setmode 2017-03-06 22:06:38 +01:00
svenhoefer
2029a684e5 - move public libcoolstream-headers to hardware directory 2017-03-06 21:49:32 +01:00
svenhoefer
29fd05002f - port hardware_caps from Neutrino-MP 2017-03-06 21:49:32 +01:00
Jacek Jendrzej
e10cb00613 subpagetable is unsigned 2017-03-06 15:50:06 +01:00
Stefan Seyfried
3a7a202818 hw_caps: add caps for 14:9 AR and broken tuner driver 2017-03-04 20:28:21 +01:00
M. Liebmann
ff11dd44ab osd resolution: Use COsdHelpers::changeOsdResolution() to adjust...
...OSD resolution after switching video format
2017-02-28 15:04:09 +01:00
Stefan Seyfried
5c95139207 Merge remote-tracking branch 'tuxbox/master' 2017-02-22 08:44:53 +01:00
M. Liebmann
eb0d7afa95 Merge branch 'master' into pu/fb-setmode 2017-02-21 06:39:24 +01:00
Stefan Seyfried
cdc9935b83 tuxtxt: remove dead code, unnecessary header includes 2017-02-21 06:38:48 +01:00
Stefan Seyfried
291eaa0450 tuxtxt: remove old, unused input code 2017-02-21 06:38:48 +01:00
Stefan Seyfried
b3a79a3a33 tuxtxt: remove old framebuffer device code 2017-02-21 06:38:48 +01:00
Stefan Seyfried
dfddc62d0c tuxtxt: remove unused dmx variable 2017-02-21 06:38:48 +01:00
Stefan Seyfried
418819e261 libtuxtxt: remove unused fd parameter from tuxtx_main() 2017-02-21 06:38:48 +01:00
M. Liebmann
d76c9c536c Merge branch 'master' into pu/fb-setmode 2017-02-20 00:11:48 +01:00
M. Liebmann
b7110faaf6 tuxtxt: Use hw blitting with fbCopyArea() for cs hd2 2017-02-20 00:09:46 +01:00
Stefan Seyfried
50cf26441f tuxtxt: remove dead code, unnecessary header includes 2017-02-19 18:14:57 +01:00
Stefan Seyfried
98b7904a47 tuxtxt: remove old, unused input code 2017-02-19 18:04:50 +01:00
Stefan Seyfried
39bb1c5cad tuxtxt: remove old framebuffer device code 2017-02-19 14:34:44 +01:00