mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 08:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
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
This commit is contained in:
vanhofen
2017-02-13 21:41:04 +01:00
parent 5ae7e351ae 168e359e2a
commit 315955cc0d
19 changed files with 432 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/fb_accel_cs_hd1.cpp
View File

@@ -325,9 +325,25 @@ void CFbAccelCSHD1::setupGXA()
add_gxa_sync_marker();
}
/* wrong name... */
void CFbAccelCSHD1::setOsdResolutions()
{
/* FIXME: Infos available in driver? */
osd_resolution_t res;
osd_resolutions.clear();
res.xRes = 1280;
res.yRes = 720;
res.bpp = 32;
osd_resolutions.push_back(res);
}
int CFbAccelCSHD1::setMode(unsigned int, unsigned int, unsigned int)
{
if (!available&&!active)
return -1;
if (osd_resolutions.empty())
setOsdResolutions();
fb_fix_screeninfo _fix;
if (ioctl(fd, FBIOGET_FSCREENINFO, &_fix) < 0) {