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

framebuffer_ng: use global ICONSDIR_VAR

Browse Source 
this implements CFrameBuffer part of commit e33323d5b
("fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h")


Origin commit data
------------------
Branch: ni/coolstream
Commit: a775af135a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 18:18:32 +01:00
parent 247c16a717
commit d9a01b43e3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/framebuffer_ng.cpp
View File

@@ -59,7 +59,6 @@ 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
@@ -816,7 +815,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
std::string newname = filename; std::string newname = filename;
/* if it is not an absolute path, search in configured paths */ /* if it is not an absolute path, search in configured paths */
if (filename.find("/", 0) == std::string::npos) { if (filename.find("/", 0) == std::string::npos) {
newname = ICONDIR_VAR + filename + ".png"; newname = ICONSDIR_VAR + filename + ".png";
if (access(newname.c_str(), F_OK)) if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".png"; newname = iconBasePath + filename + ".png";
} }
@@ -838,7 +837,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
goto _display; goto _display;
} }
newname = ICONDIR_VAR + filename + ".raw"; newname = ICONSDIR_VAR + filename + ".raw";
if (access(newname.c_str(), F_OK)) if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".raw"; newname = iconBasePath + filename + ".raw";