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

variable scaling

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: e668ca4348
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-11 (Thu, 11 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-02-11 14:25:46 +00:00
parent d2962d0d72
commit 60251acd8c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/streaminfo2.cpp
View File

@@ -354,7 +354,7 @@ void CStreamInfo2::paint_signal_fe(struct bitrate br, struct feSignal s)
SignalRenderStr(br.max_short_average/ 1000ULL, sig_text_rate_x, yt - sheight - sheight); SignalRenderStr(br.max_short_average/ 1000ULL, sig_text_rate_x, yt - sheight - sheight);
SignalRenderStr(br.min_short_average/ 1000ULL, sig_text_rate_x, yt); SignalRenderStr(br.min_short_average/ 1000ULL, sig_text_rate_x, yt);
if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){ if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){
yd = y_signal_fe (value, 20000, sigBox_h);// Video + Audio yd = y_signal_fe (value, scaling, sigBox_h);// Video + Audio
} else { } else {
yd = y_signal_fe (value, 512, sigBox_h); // Audio only yd = y_signal_fe (value, 512, sigBox_h); // Audio only
} }
@@ -591,11 +591,14 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
char * f=NULL, *s=NULL, *m=NULL; char * f=NULL, *s=NULL, *m=NULL;
if(frontend->getInfo()->type == FE_QPSK) { if(frontend->getInfo()->type == FE_QPSK) {
frontend->getDelSys((fe_code_rate_t)si.fec, dvbs_get_modulation((fe_code_rate_t)si.fec), f, s, m); frontend->getDelSys((fe_code_rate_t)si.fec, dvbs_get_modulation((fe_code_rate_t)si.fec), f, s, m);
if (!strncmp(s,const_cast<char *>("DVB-S2"),6)) if (!strncmp(s,const_cast<char *>("DVB-S2"),6)){
s=const_cast<char *>("S2"); s=const_cast<char *>("S2");
else scaling = 20000;
}
else{
s=const_cast<char *>("S1"); s=const_cast<char *>("S1");
scaling = 15000;
}
sprintf ((char *) buf,"%d.%d (%c) %d %s %s %s", si.tsfrequency / 1000, si.tsfrequency % 1000, si.polarisation ? 'V' : 'H', si.rate / 1000,f,m,s); sprintf ((char *) buf,"%d.%d (%c) %d %s %s %s", si.tsfrequency / 1000, si.tsfrequency % 1000, si.polarisation ? 'V' : 'H', si.rate / 1000,f,m,s);
g_Font[font_info]->RenderString(xpos, ypos, width*2/3-10, "Tp. Freq.:" , COL_MENUCONTENTDARK, 0, true); // UTF-8 g_Font[font_info]->RenderString(xpos, ypos, width*2/3-10, "Tp. Freq.:" , COL_MENUCONTENTDARK, 0, true); // UTF-8
g_Font[font_info]->RenderString(xpos+spaceoffset, ypos, width*2/3-10, buf, COL_MENUCONTENTDARK, 0, true); // UTF-8 g_Font[font_info]->RenderString(xpos+spaceoffset, ypos, width*2/3-10, buf, COL_MENUCONTENTDARK, 0, true); // UTF-8

2
src/gui/streaminfo2.h
View File

@@ -61,7 +61,7 @@ class CStreamInfo2 : public CMenuTarget
int sig_text_sig_x; int sig_text_sig_x;
int sig_text_snr_x; int sig_text_snr_x;
int sig_text_rate_x; int sig_text_rate_x;
unsigned int scaling;
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;