From 88a6931d215a88caef6f2b0321e201ecd6857ab8 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 20 Sep 2020 21:10:53 +0200 Subject: [PATCH] re arrange logos --- src/gui/streaminfo2.cpp | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index d614bb5b4..7a3603954 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -1107,9 +1107,15 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) r.val = buf; v.push_back(r); - // e2 channellogo - r.key = "E2 Logo"; + // special channellogo + r.key = "Special Logo"; r.key += ": "; + std::string SpecialChannelName = GetSpecialName(channel->getName()); + snprintf(buf, sizeof(buf), "%s.png", SpecialChannelName.c_str()); + r.val = buf; + v.push_back(r); + + // e2 channellogo char e2filename1[255]; e2filename1[0] = '\0'; char e2filename2[255]; @@ -1139,20 +1145,19 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) (u_int) cc->getSatellitePosition()); } - if ((std::string) e2filename1 != (std::string) e2filename2) - snprintf(buf, sizeof(buf), "%s.png / %s.png", e2filename1, e2filename2); - else - snprintf(buf, sizeof(buf), "%s.png", e2filename1); + r.key = "E2 Logo 1"; + r.key += ": "; + snprintf(buf, sizeof(buf), "%s.png", e2filename1); r.val = buf; v.push_back(r); - // special channellogo - r.key = "Special Logo"; - r.key += ": "; - std::string SpecialChannelName = GetSpecialName(channel->getName()); - snprintf(buf, sizeof(buf), "%s.png", SpecialChannelName.c_str()); - r.val = buf; - v.push_back(r); + if ((std::string) e2filename1 != (std::string) e2filename2) { + r.key = "E2 Logo 2"; + r.key += ": "; + snprintf(buf, sizeof(buf), "%s.png", e2filename2); + r.val = buf; + v.push_back(r); + } } // empty line