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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
This commit is contained in:
vanhofen
2017-02-13 23:29:07 +01:00
parent c9ab20d703 1a0368da1e
commit ca916b849c
20 changed files with 455 additions and 121 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();