Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Origin commit data
------------------
Commit: e83babe2c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-27 (Mon, 27 Feb 2017)
This commit is contained in:
vanhofen
2017-02-27 08:01:20 +01:00

View File

@@ -278,6 +278,8 @@ 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 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 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 int scale2Res(int size) { return size; };
virtual bool fullHdAvailable() { return false; }; virtual bool fullHdAvailable() { return false; };
virtual void setOsdResolutions(); virtual void setOsdResolutions();