mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

streaminfo: show techinfo in TS_MODE if channelist is empty

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c6ef9b43a
Author: GetAway <get-away@t-online.de>
Date: 2018-11-13 (Tue, 13 Nov 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
GetAway
2018-11-13 20:52:30 +01:00
committed by vanhofen
parent c44c807710
commit 34cea26979
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/streaminfo1.cpp
View File

@@ -517,6 +517,8 @@ void CStreamInfo2::paint (int /*mode*/)
void CStreamInfo2::paint_techinfo(int xpos, int ypos)
{
char buf[100];
bool has_vpid = false;
bool is_webchan = false;
int xres = 0, yres = 0, aspectRatio = 0, framerate = -1;
// paint labels
int spaceoffset = 0,i = 0;
@@ -528,7 +530,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
frameBuffer->paintBoxRel (0, ypos, box_width, box_h, COL_MENUCONTENT_PLUS_0);
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
if(!channel)
if(!channel && !mp)
return;
int array[]= {g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_RESOLUTION)),
@@ -549,9 +551,14 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
average_bitrate_offset = spaceoffset;
int box_width2 = box_width-(spaceoffset+xpos);
if (channel)
{
has_vpid = channel->getVideoPid();
is_webchan = IS_WEBCHAN(channel->getChannelID());
}
int _mode = CNeutrinoApp::getInstance()->getMode();
if ((channel->getVideoPid() ||
(IS_WEBCHAN(channel->getChannelID()) && _mode == NeutrinoModes::mode_webtv) ||
if ((has_vpid ||
(is_webchan && _mode == NeutrinoModes::mode_webtv) ||
_mode == NeutrinoModes::mode_ts) &&
!(videoDecoder->getBlank()))
{