From 1c5fe5a0ebfff3ea06974fc32efc7be9c7e00711 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 7 Mar 2014 23:03:57 +0100 Subject: [PATCH] pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7ab37854c648452a8419203fa2f63603502d2fa7 Author: vanhofen Date: 2014-03-07 (Fri, 07 Mar 2014) Origin message was: ------------------ - pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/pictureviewer/pictureviewer.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index d42b6f606..439518cf7 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -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];