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

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

Browse Source 
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-13 23:29:07 +01:00
parent 55d5e6bf90 5b537a782f
commit e67e33d323
20 changed files with 455 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/fb_accel.h
View File

@@ -108,6 +108,7 @@ class CFbAccelCSHD1
void setBlendLevel(int);
void add_gxa_sync_marker(void);
void setupGXA(void);
void setOsdResolutions();
};
class CFbAccelCSHD2
@@ -127,6 +128,9 @@ class CFbAccelCSHD2
void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff);
void setBlendMode(uint8_t);
void setBlendLevel(int);
int scaleFont(int size);
bool fullHdAvailable();
void setOsdResolutions();
};
class CFbAccelGLFB