Commit Graph

15 Commits

Author SHA1 Message Date
vanhofen
eabacd65bf Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: db9e856c38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-19 23:22:48 +01:00
vanhofen
22c66526da framebuffer: rename scaleFont() to scale2Res()
Origin commit data
------------------
Branch: ni/coolstream
Commit: e631c3e3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- framebuffer: rename scaleFont() to scale2Res()

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

------------------
This commit was generated by Migit
2017-02-19 23:22:12 +01:00
vanhofen
5708ad998c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


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



------------------
This commit was generated by Migit
2017-02-15 21:52:59 +01:00
Michael Liebmann
35f4aec20e Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa5f8e9a65
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-15 18:40:47 +01:00
Michael Liebmann
04ab274e2a fb_accel_cs_hd2: add missing getBackBufferPointer()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84edb25f3f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-15 18:39:02 +01:00
Michael Liebmann
78a5a4a658 Merge branch 'master' into pu/fb-setmode
Fix merge conflict


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



------------------
This commit was generated by Migit
2017-02-14 20:11:08 +01:00
Stefan Seyfried
ddb457bc90 implement getWidth4FB_HW_ACC in fb_accel class
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


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



------------------
This commit was generated by Migit
2017-02-14 20:01:55 +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
Michael Liebmann
d5d1fc0728 CFbAccelCSHD2::setMode: Update for new framebuffer driver (full hd)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33125aed06
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
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
Thilo Graf
c255a465f3 fb_accel_cs_hdx: remove dub includes, add includes into common header file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fe7504007
Author: Thilo Graf <dbt@novatux.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-08 20:16:07 +01:00
Michael Liebmann
8cd23f3f89 fb_accel: Some renaming nevis => hd1 & apollo => hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: f94afc1593
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
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-08 13:32:46 +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