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

CFrameBuffer: outsource code for icon path detecting

Browse Source 
Unified handling and makes it possible to use in other objects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 97343d1190
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-17 (Thu, 17 Mar 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-03-17 10:25:26 +01:00
parent d93986f5bd
commit 1cfe8b4411
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/framebuffer.cpp
View File

@@ -1013,6 +1013,18 @@ void CFrameBuffer::setIconBasePath(const std::string & iconPath)
iconBasePath = iconPath;
}
std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type)
{
std::string path, filetype;
filetype = "." + file_type;
path = std::string(ICONSDIR_VAR) + "/" + icon_name + filetype;
if (access(path.c_str(), F_OK))
path = iconBasePath + "/" + icon_name + filetype;
if (icon_name.find("/", 0) != std::string::npos)
path = icon_name;
return path;
}
void CFrameBuffer::getIconSize(const char * const filename, int* width, int *height)
{
*width = 0;
@@ -1110,11 +1122,7 @@ 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(ICONSDIR_VAR) + "/" + filename + ".png";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + "/" + filename + ".png";
if (filename.find("/", 0) != std::string::npos)
newname = filename;
std::string newname = getIconPath(filename);
//printf("CFrameBuffer::paintIcon: check for %s\n", newname.c_str());fflush(stdout);
data = g_PicViewer->getIcon(newname, &width, &height);
@@ -1133,9 +1141,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
goto _display;
}
newname = std::string(ICONSDIR_VAR) + "/" + filename + ".raw";
if (access(newname.c_str(), F_OK))
newname = iconBasePath + "/" + filename + ".raw";
newname = getIconPath(filename, "raw");
int lfd = open(newname.c_str(), O_RDONLY);