mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +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
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
This commit is contained in:
vanhofen
2017-02-13 21:41:04 +01:00
parent ad57b03429 789fdb6d86
commit 8704cb914a
19 changed files with 432 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver/fb_generic.h
View File

@@ -39,6 +39,13 @@
typedef struct fb_var_screeninfo t_fb_var_screeninfo;
typedef struct osd_resolution_t
{
uint32_t yRes;
uint32_t xRes;
uint32_t bpp;
} osd_resolution_struct_t;
typedef struct gradientData_t
{
fb_pixel_t* gradientBuf;
@@ -270,6 +277,10 @@ class CFrameBuffer : public sigc::trackable
void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff);
virtual void mark(int x, int y, int dx, int dy);
virtual int scaleFont(int size) { return size; };
virtual bool fullHdAvailable() { return false; };
virtual void setOsdResolutions();
std::vector<osd_resolution_t> osd_resolutions;
//NI
void clearIconCache();