From 5ce97439959954b5f3094e80731330e43cbd04a9 Mon Sep 17 00:00:00 2001 From: striper Date: Sun, 24 Apr 2011 10:59:19 +0000 Subject: [PATCH] - 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 --- src/driver/pictureviewer/pictureviewer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index be190e40e..29750c6eb 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -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)