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

fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-05-06 10:36:56 +02:00
parent c095a9cbd5
commit e33323d5ba
10 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/framebuffer.cpp
View File

@@ -59,7 +59,6 @@ extern cVideo * videoDecoder;
extern CPictureViewer * g_PicViewer;
#define ICON_CACHE_SIZE 1024*1024*2 // 2mb
#define ICONDIR_VAR "/var/tuxbox/icons/"
#define BACKGROUNDIMAGEWIDTH 720
@@ -1066,9 +1065,9 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
/* we cache and check original name */
it = icon_cache.find(filename);
if(it == icon_cache.end()) {
std::string newname = std::string(ICONDIR_VAR) + filename + ".png";
std::string newname = std::string(ICONSDIR_VAR) + "/" + filename + ".png";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".png";
newname = iconBasePath + "/" + filename + ".png";
if (filename.find("/", 0) != std::string::npos)
newname = filename;
//printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout);
@@ -1089,9 +1088,9 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
goto _display;
}
newname = std::string(ICONDIR_VAR) + filename + ".raw";
newname = std::string(ICONSDIR_VAR) + "/" + filename + ".raw";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + filename + ".raw";
newname = iconBasePath + "/" + filename + ".raw";
int lfd = open(newname.c_str(), O_RDONLY);
@@ -1800,9 +1799,9 @@ void CFrameBuffer::Clear()
void CFrameBuffer::showFrame(const std::string & filename)
{
std::string picture = std::string(ICONDIR_VAR) + filename;
std::string picture = std::string(ICONSDIR_VAR) + "/" + filename;
if (access(picture.c_str(), F_OK))
picture = iconBasePath + filename;
picture = iconBasePath + "/" + filename;
if (filename.find("/", 0) != std::string::npos)
picture = filename;