mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 02:11:04 +02:00
Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/neutrino.h
Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
This commit is contained in:
@@ -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
|
||||
@@ -284,6 +285,7 @@ class CFrameBuffer : public sigc::trackable
|
||||
virtual bool fullHdAvailable() { return false; };
|
||||
virtual void setOsdResolutions();
|
||||
std::vector<osd_resolution_t> osd_resolutions;
|
||||
size_t getIndexOsdResolution(uint32_t mode);
|
||||
|
||||
//NI
|
||||
void clearIconCache();
|
||||
|
Reference in New Issue
Block a user