mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +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:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 15:36:23 +01:00
parent a7cdb2e024 ff6188530e
commit bf56f9f0bc
21 changed files with 310 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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>
@@ -367,9 +368,22 @@ void CFrameBuffer::setOsdResolutions()
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*/ )