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

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

Browse Source 
Origin commit data
------------------
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
This commit is contained in:
vanhofen
2017-08-09 10:37:47 +02:00
parent d339f73231 ad105085c2
commit b327436c94
22 changed files with 233 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/fb_generic.h
View File

@@ -238,6 +238,7 @@ class CFrameBuffer : public sigc::trackable
const int h = 0, const unsigned char offset = 1, bool paint = true, bool paintBg = false, const fb_pixel_t colBg = 0);
bool paintIcon8(const std::string & filename, const int x, const int y, const unsigned char offset = 0);
void loadPal (const std::string & filename, const unsigned char offset = 0, const unsigned char endidx = 255);
void clearIconCache();
bool loadPicture2Mem (const std::string & filename, fb_pixel_t * const memp);
bool loadPicture2FrameBuffer(const std::string & filename);
@@ -285,9 +286,6 @@ class CFrameBuffer : public sigc::trackable
std::vector<osd_resolution_t> osd_resolutions;
size_t getIndexOsdResolution(uint32_t mode);
//NI
void clearIconCache();
enum
{
TM_EMPTY = 0,