From 13f171b6a5123bae05cca8df0625eac7fc367d73 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 6 Nov 2016 20:54:26 +0100 Subject: [PATCH] epgview: use movie-info's channelname in movieplayer mode to get channellogo Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3b2569498376656c0e0321054d8774432db916f6 Author: vanhofen Date: 2016-11-06 (Sun, 06 Nov 2016) Origin message was: ------------------ - epgview: use movie-info's channelname in movieplayer mode to get channellogo ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 521d9b3d7..33af8c90b 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -713,10 +713,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start int logo_w = 0; int logo_h = 0; int logo_w_max = ox / 4; - if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, g_Zapit->getChannelName(channel_id), lname, &logo_w, &logo_h)) { - if((logo_h > (toph-4)) || (logo_w > logo_w_max)) { + std::string channel_name; + if (mp_info) + channel_name = mp_movie_info->channelName; + else + channel_name = g_Zapit->getChannelName(channel_id); + if (g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, channel_name, lname, &logo_w, &logo_h)) + { + if ((logo_h > (toph-4)) || (logo_w > logo_w_max)) g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4); - } pic_offx = logo_w + 10; }