Commit Graph

21 Commits

Author SHA1 Message Date
vanhofen
e67e33d323 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
2017-02-13 23:29:07 +01:00
vanhofen
315955cc0d 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
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2017-02-13 21:41:04 +01:00
Michael Liebmann
3903507312 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
Michael Liebmann
9fe7ca7e26 CFbAccelCSHD2: Add scaleFont()function for font upscaling when fullhd is aktiv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88c834221b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
vanhofen
ff7b7dfde7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:04:09 +01:00
vanhofen
6e85f1b0ca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:01:15 +01:00
Stefan Seyfried
54ca471493 fb_accel_td: implement setBlendMode/Level
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67387a13c6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 22:49:14 +01:00
vanhofen
8a8036b8b8 fb_accel.h: make 8872419ed1 complete
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6267ec4194
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- fb_accel.h: make 8872419ed1 complete

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

------------------
This commit was generated by Migit
2017-02-12 22:30:04 +01:00
vanhofen
ab0fdc2825 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 20:22:37 +01:00
Stefan Seyfried
3c1be3d536 fb_accel: add TripleDragon framebuffer code
Origin commit data
------------------
Branch: ni/coolstream
Commit: b04b1d7f8c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 12:57:18 +01:00
vanhofen
57d2b56bd4 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp


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



------------------
This commit was generated by Migit
2017-02-08 20:38:28 +01:00
Michael Liebmann
824f78dd3d fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2
Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4afe1e8e0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2

 Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp


------------------
This commit was generated by Migit
2017-02-08 12:52:26 +01:00
Michael Liebmann
bf4f72f3cc fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1
Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58bd8a4a63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1

 Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp


------------------
This commit was generated by Migit
2017-02-08 12:52:25 +01:00
vanhofen
8872419ed1 fix build; try to port our framebuffer changes (need fixes!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)

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

------------------
This commit was generated by Migit
2017-02-08 09:45:53 +01:00
Michael Liebmann
e33fdc1708 CFbAccelCSApollo: Add paintHLineRel() & paintVLineRel() functions
- Remove unused debug output


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35b48372f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 09:32:17 +01:00
Michael Liebmann
f1783ad5fa CFbAccelCSNevis: Add paintHLineRel() & paintVLineRel() functions
- Remove unused debug output


Origin commit data
------------------
Branch: ni/coolstream
Commit: 10e82c0ece
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 09:32:17 +01:00
Michael Liebmann
68a1c5e30e neutrino: Replace USE_NEVIS_GXA with hardware-specific macros
- Existing USE_NEVIS_GXA definitions in the build system
 (neutrino configure) can be removed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 02d85f2ff2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
neutrino: Replace USE_NEVIS_GXA with hardware-specific macros

- Existing USE_NEVIS_GXA definitions in the build system
 (neutrino configure) can be removed.


------------------
This commit was generated by Migit
2017-02-08 06:06:24 +01:00
Stefan Seyfried
a553cc417a fb_accel: add backend for GL framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2498ebb314
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Michael Liebmann
6aef723484 fb_accel: add accelerated framebuffer for Apollo graphic chips
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ff9ff695b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-07 (Tue, 07 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
7d945c2d59 fb_accel: add accelerated framebuffer for Nevis GXA chips
Signed-off-by: M. Liebmann <git@tuxcode.de>


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



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
6635b24aa0 framebuffer: add accelerator for STi framebuffer
also add a generic helper class for other accelerated
framebuffer implementations


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



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00