mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
- 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:
@@ -451,11 +451,11 @@ bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, s
|
|||||||
/* first the channel-id, then the channelname */
|
/* first the channel-id, then the channelname */
|
||||||
std::string strLogoName[2] = { (std::string)strChanId, ChannelName };
|
std::string strLogoName[2] = { (std::string)strChanId, ChannelName };
|
||||||
/* first jpg, then gif */
|
/* first jpg, then gif */
|
||||||
std::string strLogoExt[2] = { ".jpg", ".gif" };
|
std::string strLogoExt[3] = { ".jpg", ".gif" , ".png" };
|
||||||
|
|
||||||
for (i = 0; i < 2; i++)
|
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]);
|
std::string tmp(g_settings.logo_hdd_dir + "/" + strLogoName[i] + strLogoExt[j]);
|
||||||
if (access(tmp.c_str(), R_OK) != -1)
|
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 (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]);
|
std::string tmp(LOGO_DIR1 "/" + strLogoName[i] + strLogoExt[j]);
|
||||||
if (access(tmp.c_str(), R_OK) != -1)
|
if (access(tmp.c_str(), R_OK) != -1)
|
||||||
|
Reference in New Issue
Block a user