mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix picture view move; Enable hw blit for picture/logo; Move channel logo display after all channellist shown

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@273 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-06 15:13:12 +00:00
parent 098165cbb3
commit 022509f24e
5 changed files with 91 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/framebuffer.cpp
View File

@@ -1516,7 +1516,8 @@ void * CFrameBuffer::convertRGB2FB(unsigned char *rgbbuff, unsigned long x, unsi
unsigned int *fbbuff;
unsigned long count = x*y;
fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int));
//fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int));
fbbuff = (unsigned int *) cs_malloc_uncached(count * sizeof(unsigned int));
if(fbbuff == NULL)
{
printf("convertRGB2FB: Error: malloc\n");
@@ -1608,6 +1609,5 @@ void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, in
CFrameBuffer::getInstance()->Clear();
blit2FB(fbbuff, x_size, y_size, x_offs, y_offs, x_pan, y_pan);
free(fbbuff);
cs_free_uncached(fbbuff);
}

6
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -387,7 +387,7 @@ void CPictureViewer::showBusy (int sx, int sy, int width, char r, char g, char b
m_busy_y = sy;
m_busy_width = width;
m_busy_cpp = cpp;
free (fb_buffer);
cs_free_uncached (fb_buffer);
// dbout("Show Busy}\n");
}
@@ -546,12 +546,10 @@ printf("getImage: resize %s to %d x %d \n", name.c_str (), width, height);
y = height;
}
ret = (fb_pixel_t *) CFrameBuffer::getInstance()->convertRGB2FB(buffer, x, y, convertSetupAlpha2Alpha(g_settings.infobar_alpha));
free(buffer);
} else {
printf ("Error decoding file %s\n", name.c_str ());
free (buffer);
buffer = NULL;
}
free(buffer);
} else
printf("Error open file %s\n", name.c_str ());