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

pictureviewer: search for e2 picons in LOGODIR_VAR and LOGODIR too

Browse Source 
Origin commit data
------------------
Commit: f08d1f9392
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)

Origin message was:
------------------
- pictureviewer: search for e2 picons in LOGODIR_VAR and LOGODIR too
This commit is contained in:
vanhofen
2018-09-09 13:06:05 +02:00
parent 60ee492710
commit 9cb677714b
1 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -536,10 +536,35 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string&
snprintf(strChnId, 16, "%llx", channel_id & 0xFFFFFFFFFFFFULL); snprintf(strChnId, 16, "%llx", channel_id & 0xFFFFFFFFFFFFULL);
strChnId[15] = '\0'; strChnId[15] = '\0';
//create E2 filenames
char e2filename1[255];
e2filename1[0] = '\0';
char e2filename2[255];
e2filename2[0] = '\0';
CZapitChannel * cc = NULL; CZapitChannel * cc = NULL;
if (CNeutrinoApp::getInstance()->channelList) if (CNeutrinoApp::getInstance()->channelList)
cc = CNeutrinoApp::getInstance()->channelList->getChannel(channel_id); cc = CNeutrinoApp::getInstance()->channelList->getChannel(channel_id);
if (cc)
{
//create E2 filename1
snprintf(e2filename1, sizeof(e2filename1), "1_0_%X_%X_%X_%X_%X0000_0_0_0",
(u_int) cc->getServiceType(true),
(u_int) channel_id & 0xFFFF,
(u_int) (channel_id >> 32) & 0xFFFF,
(u_int) (channel_id >> 16) & 0xFFFF,
(u_int) cc->getSatellitePosition());
//create E2 filename2
snprintf(e2filename2, sizeof(e2filename2), "1_0_%X_%X_%X_%X_%X0000_0_0_0",
(u_int) 1,
(u_int) channel_id & 0xFFFF,
(u_int) (channel_id >> 32) & 0xFFFF,
(u_int) (channel_id >> 16) & 0xFFFF,
(u_int) cc->getSatellitePosition());
}
for (size_t i = 0; i<(sizeof(fileType) / sizeof(fileType[0])); i++){ for (size_t i = 0; i<(sizeof(fileType) / sizeof(fileType[0])); i++){
std::vector<std::string> v_path; std::vector<std::string> v_path;
std::string id_tmp_path; std::string id_tmp_path;
@@ -554,28 +579,19 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string&
id_tmp_path += strChnId + fileType[i]; id_tmp_path += strChnId + fileType[i];
v_path.push_back(id_tmp_path); v_path.push_back(id_tmp_path);
//create E2 filenames if (e2filename1[0] != '\0')
if (cc)
{ {
char fname[255]; //create E2 filename1
snprintf(fname, sizeof(fname), "1_0_%X_%X_%X_%X_%X0000_0_0_0",
(u_int) cc->getServiceType(true),
(u_int) channel_id & 0xFFFF,
(u_int) (channel_id >> 32) & 0xFFFF,
(u_int) (channel_id >> 16) & 0xFFFF,
(u_int) cc->getSatellitePosition());
id_tmp_path = g_settings.logo_hdd_dir + "/"; id_tmp_path = g_settings.logo_hdd_dir + "/";
id_tmp_path += std::string(fname) + fileType[i]; id_tmp_path += std::string(e2filename1) + fileType[i];
v_path.push_back(id_tmp_path); v_path.push_back(id_tmp_path);
}
snprintf(fname, sizeof(fname), "1_0_%X_%X_%X_%X_%X0000_0_0_0", if (e2filename2[0] != '\0')
(u_int) 1, {
(u_int) channel_id & 0xFFFF, //create E2 filename2
(u_int) (channel_id >> 32) & 0xFFFF,
(u_int) (channel_id >> 16) & 0xFFFF,
(u_int) cc->getSatellitePosition());
id_tmp_path = g_settings.logo_hdd_dir + "/"; id_tmp_path = g_settings.logo_hdd_dir + "/";
id_tmp_path += std::string(fname) + fileType[i]; id_tmp_path += std::string(e2filename2) + fileType[i];
v_path.push_back(id_tmp_path); v_path.push_back(id_tmp_path);
} }
@@ -589,6 +605,22 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string&
id_tmp_path = LOGODIR_VAR "/"; id_tmp_path = LOGODIR_VAR "/";
id_tmp_path += strChnId + fileType[i]; id_tmp_path += strChnId + fileType[i];
v_path.push_back(id_tmp_path); v_path.push_back(id_tmp_path);
if (e2filename1[0] != '\0')
{
//create E2 filename1 (LOGODIR_VAR)
id_tmp_path = LOGODIR_VAR "/";
id_tmp_path += std::string(e2filename1) + fileType[i];
v_path.push_back(id_tmp_path);
}
if (e2filename2[0] != '\0')
{
//create E2 filename2 (LOGODIR_VAR)
id_tmp_path = LOGODIR_VAR "/";
id_tmp_path += std::string(e2filename2) + fileType[i];
v_path.push_back(id_tmp_path);
}
} }
if(g_settings.logo_hdd_dir != LOGODIR){ if(g_settings.logo_hdd_dir != LOGODIR){
//create filename with channel name (LOGODIR) //create filename with channel name (LOGODIR)
@@ -600,6 +632,22 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string&
id_tmp_path = LOGODIR "/"; id_tmp_path = LOGODIR "/";
id_tmp_path += strChnId + fileType[i]; id_tmp_path += strChnId + fileType[i];
v_path.push_back(id_tmp_path); v_path.push_back(id_tmp_path);
if (e2filename1[0] != '\0')
{
//create E2 filename1 (LOGODIR)
id_tmp_path = LOGODIR "/";
id_tmp_path += std::string(e2filename1) + fileType[i];
v_path.push_back(id_tmp_path);
}
if (e2filename2[0] != '\0')
{
//create E2 filename2 (LOGODIR)
id_tmp_path = LOGODIR "/";
id_tmp_path += std::string(e2filename2) + fileType[i];
v_path.push_back(id_tmp_path);
}
} }
//check if file is available, name with real name is preferred, return true on success //check if file is available, name with real name is preferred, return true on success
for (size_t j = 0; j < v_path.size(); j++){ for (size_t j = 0; j < v_path.size(); j++){