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 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
This commit is contained in:
Jacek Jendrzej
2017-06-07 16:20:47 +02:00
parent 3ef61938c1 66f45a1be9
commit 4643ac3f51
80 changed files with 1972 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/fb_generic.h
View File

@@ -39,6 +39,14 @@
typedef struct fb_var_screeninfo t_fb_var_screeninfo;
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
{
fb_pixel_t* gradientBuf;
@@ -269,6 +277,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);
enum
{