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

allow *.png as logo. todo: fix transparency (patch by FlatTV)

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1415 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 5ce9743995
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-04-24 (Sun, 24 Apr 2011)

Origin message was:
------------------
- allow *.png as logo. todo: fix transparency (patch by FlatTV)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1415 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
gixxpunk
2011-04-24 10:59:19 +00:00
parent 0e8d1c2f82
commit d0d5db4d83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,11 +451,11 @@ bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, s
/* first the channel-id, then the channelname */
std::string strLogoName[2] = { (std::string)strChanId, ChannelName };
/* first jpg, then gif */
std::string strLogoExt[2] = { ".jpg", ".gif" };
std::string strLogoExt[3] = { ".jpg", ".gif" , ".png" };
for (i = 0; i < 2; i++)
{
for (j = 0; j < 2; j++)
for (j = 0; j < 3; j++)
{
std::string tmp(g_settings.logo_hdd_dir + "/" + strLogoName[i] + strLogoExt[j]);
if (access(tmp.c_str(), R_OK) != -1)
@@ -469,7 +469,7 @@ bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, s
}
for (i = 0; i < 2; i++)
{
for (j = 0; j < 2; j++)
for (j = 0; j < 3; j++)
{
std::string tmp(LOGO_DIR1 "/" + strLogoName[i] + strLogoExt[j]);
if (access(tmp.c_str(), R_OK) != -1)