mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

streaminfo2: -fix repaint casystem

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1457 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42ba7d0dea
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-05-11 (Wed, 11 May 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-05-11 09:40:55 +00:00
parent a6c60ceee0
commit 8719f652f4
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/streaminfo2.cpp
View File

@@ -101,6 +101,7 @@ CStreamInfo2::CStreamInfo2 ()
rate.max_short_average = 0; rate.max_short_average = 0;
rate.min_short_average = 0; rate.min_short_average = 0;
box_h = 0; box_h = 0;
box_h2 = 0;
} }
CStreamInfo2::~CStreamInfo2 () CStreamInfo2::~CStreamInfo2 ()
@@ -726,7 +727,13 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
void CStreamInfo2::paintCASystem(int xpos, int ypos) void CStreamInfo2::paintCASystem(int xpos, int ypos)
{ {
extern int pmt_caids[4][11]; extern int pmt_caids[4][11];
unsigned short i,j; unsigned short i,j, ypos1 = 0;
int box_width = width*2/3-10;
if(box_h2 > 0)
{
frameBuffer->paintBoxRel (0, ypos, box_width, box_h2, COL_MENUHEAD_PLUS_0);
}
std::string casys[11]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; std::string casys[11]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
bool caids[11] ={ false, false, false, false, false, false, false, false, false, false, false }; bool caids[11] ={ false, false, false, false, false, false, false, false, false, false, false };
char tmp[100] = {0}; char tmp[100] = {0};
@@ -897,7 +904,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
if(caids[ca_id] == true){ if(caids[ca_id] == true){
if(cryptsysteme){ if(cryptsysteme){
ypos += iheight; ypos += iheight;
g_Font[font_info]->RenderString(xpos , ypos, width*2/3-10, "Cryptsysteme:" , COL_INFOBAR, 0, false); g_Font[font_info]->RenderString(xpos , ypos, box_width, "Cryptsysteme:" , COL_INFOBAR, 0, false);
cryptsysteme = false; cryptsysteme = false;
} }
ypos += sheight; ypos += sheight;
@@ -906,7 +913,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
std::string::size_type last_pos = casys[ca_id].find_first_not_of(tok, 0); std::string::size_type last_pos = casys[ca_id].find_first_not_of(tok, 0);
std::string::size_type pos = casys[ca_id].find_first_of(tok, last_pos); std::string::size_type pos = casys[ca_id].find_first_of(tok, last_pos);
while (std::string::npos != pos || std::string::npos != last_pos){ while (std::string::npos != pos || std::string::npos != last_pos){
g_Font[font_small]->RenderString(xpos + width_txt, ypos, width*2/3-10, casys[ca_id].substr(last_pos, pos - last_pos).c_str() , COL_INFOBAR, 0, false); g_Font[font_small]->RenderString(xpos + width_txt, ypos, box_width, casys[ca_id].substr(last_pos, pos - last_pos).c_str() , COL_INFOBAR, 0, false);
if(index == 0) if(index == 0)
width_txt = spaceoffset; width_txt = spaceoffset;
else else
@@ -919,7 +926,8 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
} }
} }
} }
if(box_h2 == 0)
box_h2 = ypos - ypos1;
} }
int CStreamInfo2Handler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CStreamInfo2Handler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)
{ {

2
src/gui/streaminfo2.h
View File

@@ -64,7 +64,7 @@ class CStreamInfo2 : public CMenuTarget
int average_bitrate_offset; int average_bitrate_offset;
unsigned int scaling; unsigned int scaling;
unsigned int pmt_version; unsigned int pmt_version;
int box_h; int box_h,box_h2;
struct feSignal { struct feSignal {
unsigned long ber, old_ber, max_ber, min_ber; unsigned long ber, old_ber, max_ber, min_ber;
unsigned long sig, old_sig, max_sig, min_sig; unsigned long sig, old_sig, max_sig, min_sig;