diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | displaychannel.c | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -177,3 +177,5 @@ Version 0.1.1 - pluginIcons: icons for VDR plugins with main menu entires - extraIcons: further icons for non standard menu elements (added via menuorg or similar) +- Searching in folder <channellogofolder>/separatorlogos for channel + separator logos diff --git a/displaychannel.c b/displaychannel.c index 245bd13..938e8d0 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -127,8 +127,6 @@ void cNopacityDisplayChannel::CreatePixmaps(void) { pixmapLogo = osd->CreatePixmap(-1, cRect(0, 0, 1, 1)); break; } - - if (config.channelFadeTime) { pixmapBackgroundTop->SetAlpha(0); @@ -398,7 +396,8 @@ void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) { } if (config.logoPosition != lpNone) { cImageLoader imgLoader; - if (imgLoader.LoadLogo(*ChannelName)) { + cString separator = cString::sprintf("separatorlogos/%s", *ChannelName); + if (imgLoader.LoadLogo(*separator)) { pixmapLogo->DrawImage(cPoint(config.logoBorder, (height-config.logoHeight)/2), imgLoader.GetImage()); } else if (imgLoader.LoadIcon("skinIcons/Channelseparator", config.logoHeight)) { pixmapLogo->DrawImage(cPoint(config.logoBorder + (config.logoWidth - config.logoHeight)/2, (height-config.logoHeight)/2), imgLoader.GetImage()); |