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 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
parent 6556882cb1 f5d9d25957
commit 68e2832f96
27 changed files with 348 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/fb_generic.h
View File

@@ -44,6 +44,7 @@ typedef struct osd_resolution_t
uint32_t yRes;
uint32_t xRes;
uint32_t bpp;
uint32_t mode;
} osd_resolution_struct_t;
typedef struct gradientData_t
@@ -277,10 +278,13 @@ class CFrameBuffer : public sigc::trackable
virtual 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);
/* Remove this when pu/fb-setmode branch is merged to master */
#define SCALE2RES_DEFINED
virtual int scale2Res(int size) { return size; };
virtual bool fullHdAvailable() { return false; };
virtual void setOsdResolutions();
std::vector<osd_resolution_t> osd_resolutions;
size_t getIndexOsdResolution(uint32_t mode);
//NI
void clearIconCache();