From 625dd19d664bfeeea609913f711c24106edc08e2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 6 Nov 2017 00:40:13 +0100 Subject: [PATCH] streaminfo: fix resolution for webradio; ... add channellogo to movieplayer-info too; not nice but informative Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8d9bce4cd7e0154ed289b67f3cf3b9b3296f80c1 Author: vanhofen Date: 2017-11-06 (Mon, 06 Nov 2017) Origin message was: ------------------ - streaminfo: fix resolution for webradio; ... add channellogo to movieplayer-info too; not nice but informative ------------------ This commit was generated by Migit --- src/gui/streaminfo2.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 2739b52d0..8cffe6e3c 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -549,7 +549,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) average_bitrate_offset = spaceoffset; int box_width2 = box_width-(spaceoffset+xpos); - if((channel->getVideoPid() || IS_WEBCHAN(channel->getChannelID())) && !(videoDecoder->getBlank())){ + if((channel->getVideoPid() || (IS_WEBCHAN(channel->getChannelID()) && CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv)) && !(videoDecoder->getBlank())){ videoDecoder->getPictureInfo(xres, yres, framerate); if (yres == 1088) yres = 1080; @@ -740,6 +740,17 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width2, buf, COL_MENUCONTENT_TEXT); } + // paint labels + int fontW = g_Font[font_small]->getWidth(); + spaceoffset = 7 * fontW; + box_width2 = box_width-(spaceoffset+xpos); + + //channellogo + ypos+= sheight; + sprintf(buf, "%llx.png", channel->getChannelID() & 0xFFFFFFFFFFFFULL); + g_Font[font_small]->RenderString(xpos, ypos, box_width, "Logo:" , COL_INFOBAR_TEXT); + g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, box_width2, buf, COL_INFOBAR_TEXT); + scaling = 27000; } else {