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

framebuffer_ng: port framebuffer features

Browse Source 
port over 1ee458e4 and a4fdd174 to framebuffer_ng
This commit is contained in:
Stefan Seyfried
2014-12-28 19:12:51 +01:00
parent d37b3c0f9a
commit 4b50fb6eb4
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/framebuffer_ng.cpp
View File

@@ -59,6 +59,7 @@ extern int gfxfd;
extern CPictureViewer * g_PicViewer; extern CPictureViewer * g_PicViewer;
#define ICON_CACHE_SIZE 1024*1024*2 // 2mb #define ICON_CACHE_SIZE 1024*1024*2 // 2mb
#define ICONDIR_VAR "/var/tuxbox/icons/"
#define BACKGROUNDIMAGEWIDTH 720 #define BACKGROUNDIMAGEWIDTH 720
@@ -809,7 +810,13 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
/* we cache and check original name */ /* we cache and check original name */
it = icon_cache.find(filename); it = icon_cache.find(filename);
if(it == icon_cache.end()) { if(it == icon_cache.end()) {
std::string newname = iconBasePath + filename.c_str() + ".png"; std::string newname = filename;
/* if it is not an absolute path, search in configured paths */
if (filename.find("/", 0) == std::string::npos) {
newname = ICONDIR_VAR + filename + ".png";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".png";
}
//printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout); //printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout);
data = g_PicViewer->getIcon(newname, &width, &height); data = g_PicViewer->getIcon(newname, &width, &height);
@@ -828,7 +835,9 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
goto _display; goto _display;
} }
newname = iconBasePath + filename.c_str() + ".raw"; newname = ICONDIR_VAR + filename + ".raw";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".raw";
lfd = open(newname.c_str(), O_RDONLY); lfd = open(newname.c_str(), O_RDONLY);