pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo)

Origin commit data
------------------
Commit: 7ab37854c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-07 (Fri, 07 Mar 2014)

Origin message was:
------------------
- pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo)
This commit is contained in:
vanhofen
2014-03-07 23:03:57 +01:00
parent f58e3e9139
commit 3e159995f1

View File

@@ -499,6 +499,7 @@ void CPictureViewer::getSize(const char* name, int* width, int *height)
}
#define LOGO_FLASH_DIR DATADIR "/neutrino/icons/logo"
#define LOGO_FLASH_DIR_VAR "/var/tuxbox/icons/logo"
bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string& ChannelName, std::string & name, int *width, int *height)
{
@@ -523,6 +524,16 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string&
id_tmp_path += strChnId + fileType[i];
v_path.push_back(id_tmp_path);
//create filename with channel name (LOGO_FLASH_DIR_VAR)
id_tmp_path = LOGO_FLASH_DIR_VAR "/";
id_tmp_path += ChannelName + fileType[i];
v_path.push_back(id_tmp_path);
//create filename with id (LOGO_FLASH_DIR_VAR)
id_tmp_path = LOGO_FLASH_DIR_VAR "/";
id_tmp_path += strChnId + fileType[i];
v_path.push_back(id_tmp_path);
//create filename with channel name (LOGO_FLASH_DIR)
id_tmp_path = LOGO_FLASH_DIR "/";
id_tmp_path += ChannelName + fileType[i];