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

framebuffer/fbaccel: merge NI code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8823cc5210
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- framebuffer/fbaccel: merge NI code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 23:13:52 +02:00
parent 9a0323fcc0
commit b8b459245f
4 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver/framebuffer_ng.cpp
View File

@@ -253,9 +253,9 @@ void CFrameBuffer::init(const char * const)
}
CFrameBuffer::~CFrameBuffer()
//NI
void CFrameBuffer::clearIconCache()
{
active = false; /* keep people/infoclocks from accessing */
std::map<std::string, rawIcon>::iterator it;
for(it = icon_cache.begin(); it != icon_cache.end(); ++it) {
@@ -263,6 +263,12 @@ CFrameBuffer::~CFrameBuffer()
cs_free_uncached(it->second.data);
}
icon_cache.clear();
}
CFrameBuffer::~CFrameBuffer()
{
active = false; /* keep people/infoclocks from accessing */
clearIconCache(); //NI
if (background) {
delete[] background;
@@ -1300,13 +1306,19 @@ void * CFrameBuffer::convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, uns
return int_convertRGB2FB(rgbbuff, x, y, 0, true);
}
void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp)
void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp, uint32_t unscaled_w, uint32_t unscaled_h) //NI
{
checkFbArea(xoff, yoff, width, height, true);
accel->blit2FB(fbbuff, width, height, xoff, yoff, xp, yp, transp);
accel->blit2FB(fbbuff, width, height, xoff, yoff, xp, yp, transp, unscaled_w, unscaled_h); //NI
checkFbArea(xoff, yoff, width, height, false);
}
//NI
void CFrameBuffer::blit2FB_unscaled(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t unscaled_w, uint32_t unscaled_h, uint32_t xp, uint32_t yp, bool transp)
{
return blit2FB(fbbuff, width, height, xoff, yoff, xp, yp, transp, unscaled_w, unscaled_h);
}
void CFrameBuffer::blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff)
{
checkFbArea(xoff, yoff, width, height, true);