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

supplemental to 04a8e71a22

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f1d347682
Author: TangoCash <eric@loxat.de>
Date: 2021-10-29 (Fri, 29 Oct 2021)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2021-10-29 19:33:33 +02:00
committed by vanhofen
parent 04a8e71a22
commit 6bc4a63f28
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/fb_generic.cpp
View File

@@ -700,6 +700,14 @@ std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_ty
{ {
std::vector<std::string> filetypes = { ".svg", ".png", ".jpg" }; std::vector<std::string> filetypes = { ".svg", ".png", ".jpg" };
std::string path, filetype = ""; std::string path, filetype = "";
std::string::size_type pos = icon_name.find_last_of(".");
if (pos != std::string::npos && file_type.empty())
if (std::find(filetypes.begin(), filetypes.end(), icon_name.substr(pos)) != filetypes.end())
{
icon_name = icon_name.substr(0,pos);
file_type = icon_name.substr(pos+1);
}
if (!file_type.empty()) if (!file_type.empty())
{ {
filetypes.clear(); filetypes.clear();
@@ -714,9 +722,9 @@ std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_ty
iconBasePath iconBasePath
}; };
for(int t=0; t<filetypes.size(); t++) for(unsigned int t=0; t<filetypes.size(); t++)
{ {
for(int i=0; i<dir.size(); i++) for(unsigned int i=0; i<dir.size(); i++)
{ {
path = std::string(dir[i]) + "/" + icon_name + filetypes[t]; path = std::string(dir[i]) + "/" + icon_name + filetypes[t];
if (access(path.c_str(), F_OK) == 0) if (access(path.c_str(), F_OK) == 0)
@@ -846,7 +854,7 @@ 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 = getIconPath(filename,""); std::string newname = getIconPath(filename);
//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);
@@ -1575,7 +1583,7 @@ void CFrameBuffer::Clear()
bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode) bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
{ {
std::string picture = getIconPath(filename, ""); std::string picture = getIconPath(filename);
bool ret = false; bool ret = false;
if (access(picture.c_str(), F_OK) == 0 && !(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED)) if (access(picture.c_str(), F_OK) == 0 && !(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED))

2
src/driver/fb_generic.h
View File

@@ -233,7 +233,7 @@ class CFrameBuffer : public sigc::trackable
void setIconBasePath(const std::string & iconPath); void setIconBasePath(const std::string & iconPath);
std::string getIconBasePath(){return iconBasePath;}; std::string getIconBasePath(){return iconBasePath;};
std::string getIconPath(std::string icon_name, std::string file_type = "png"); std::string getIconPath(std::string icon_name, std::string file_type = "");
void getIconSize(const char * const filename, int* width, int *height); void getIconSize(const char * const filename, int* width, int *height);
/* h is the height of the target "window", if != 0 the icon gets centered in that window */ /* h is the height of the target "window", if != 0 the icon gets centered in that window */