mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-06-07 16:20:47 +02:00
parent b3e71120b4 45f915dd39
commit ca83324763
80 changed files with 1972 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/driver/fb_generic.cpp
View File

@@ -46,6 +46,7 @@
#include <gui/audiomute.h>
#include <gui/color.h>
#include <gui/osd_helpers.h>
#include <gui/pictureviewer.h>
#include <system/debug.h>
#include <global.h>
@@ -350,8 +351,34 @@ int CFrameBuffer::setMode(unsigned int /*nxRes*/, unsigned int /*nyRes*/, unsign
if (ioctl(fd, FBIOBLANK, FB_BLANK_UNBLANK) < 0) {
printf("screen unblanking failed\n");
}
return 0;
}
void CFrameBuffer::setOsdResolutions()
{
/* FIXME: Infos available in driver? */
osd_resolution_t res;
osd_resolutions.clear();
res.xRes = 1280;
res.yRes = 720;
res.bpp = 32;
res.mode = OSDMODE_720;
osd_resolutions.push_back(res);
}
size_t CFrameBuffer::getIndexOsdResolution(uint32_t mode)
{
if (osd_resolutions.size() == 1)
return 0;
for (size_t i = 0; i < osd_resolutions.size(); i++) {
if (osd_resolutions[i].mode == mode)
return i;
}
return 0;
}
#if 0
//never used
void CFrameBuffer::setTransparency( int /*tr*/ )