diff options
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | logo.c | 10 |
2 files changed, 6 insertions, 7 deletions
@@ -1,6 +1,9 @@ VDR Skin 'EnigmaNG' Revision History ------------------------------------------ +2010-xx-xx: Version 0.1.2 +- Changed: Look for channel logos only in "logos" folder ("hqlogos" folder no longer supported). + 2010-04-05: Version 0.1.1 - Moved "General / Show progressbar" to "Logos & Symbols / Show progressbar in lists". - Fixed gcc 4.3 compiler warnings. @@ -114,15 +114,11 @@ bool cEnigmaLogoCache::LoadChannelLogo(const cChannel *Channel) filename = (char *)malloc(strlen(strLogo) + 20 /* should be enough for folder */); if (filename == NULL) goto leave; - strcpy(filename, "hqlogos/"); + strcpy(filename, "logos/"); strcat(filename, strLogo); if (!(fFoundLogo = Load(filename, ChannelLogoWidth, ChannelLogoHeight, false))) { - strcpy(filename, "logos/"); - strcat(filename, strLogo); - if (!(fFoundLogo = Load(filename, ChannelLogoWidth, ChannelLogoHeight, false))) { - error("cPluginSkinEnigma::LoadChannelLogo: LOGO \"%s.xpm\" NOT FOUND in %s/[hq]logos", strLogo, EnigmaConfig.GetLogoDir()); - fFoundLogo = Load("hqlogos/no_logo", ChannelLogoWidth, ChannelLogoHeight); //TODO? different default logo for channel/group? - } + error("cPluginSkinEnigma::LoadChannelLogo: LOGO \"%s.xpm\" NOT FOUND in %s/logos", strLogo, EnigmaConfig.GetLogoDir()); + fFoundLogo = Load("logos/no_logo", ChannelLogoWidth, ChannelLogoHeight); //TODO? different default logo for channel/group? } leave: |