diff options
| author | louis <louis.braun@gmx.de> | 2013-03-23 11:40:31 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2013-03-23 11:40:31 +0100 |
| commit | 1079718362567290fd53d545710f750e83b26a00 (patch) | |
| tree | f5d24ec6d44e9c765bde3edab219147cef878026 /displaychannel.c | |
| parent | 94993ef4504c38bbbe1b1c1f86fa84da0bf4a6eb (diff) | |
| download | skin-nopacity-1079718362567290fd53d545710f750e83b26a00.tar.gz skin-nopacity-1079718362567290fd53d545710f750e83b26a00.tar.bz2 | |
Searching in folder <channellogofolder>/separatorlogos for channel separator logos
Diffstat (limited to 'displaychannel.c')
| -rw-r--r-- | displaychannel.c | 5 |
1 files changed, 2 insertions, 3 deletions
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()); |