mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix sign of integer / unused stuff / ...

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@86 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
mws
2009-12-16 16:08:55 +00:00
parent 27328dc8ad
commit dfe40f9833
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/streaminfo2.cpp
View File

@@ -154,7 +154,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
int offset = g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_BITRATE)); int offset = g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_BITRATE));
int sw = g_Font[font_info]->getRenderWidth ("99999.999"); int sw = g_Font[font_info]->getRenderWidth ("99999.999");
int mm = g_Font[font_info]->getRenderWidth ("Max");//max min lenght int mm = g_Font[font_info]->getRenderWidth ("Max");//max min lenght
maxb = minb = lastb = 0; maxb = minb = lastb = tmp_rate = 0;
ts_setup (); ts_setup ();
while (1) { while (1) {
neutrino_msg_data_t data; neutrino_msg_data_t data;
@@ -177,7 +177,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
cnt++; cnt++;
int dheight = g_Font[font_info]->getHeight (); int dheight = g_Font[font_info]->getHeight ();
int dx1 = x + 10; int dx1 = x + 10;
int dy = y+ height - dheight - 5; // int dy = y+ height - dheight - 5;
if (ret && (lastb != bit_s)) { if (ret && (lastb != bit_s)) {
lastb = bit_s; lastb = bit_s;
@@ -335,7 +335,7 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h)
signal.old_snr = 1; signal.old_snr = 1;
signal.old_ber = 1; signal.old_ber = 1;
feSignal s = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // feSignal s = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
// paint_signal_fe(rate, signal); // paint_signal_fe(rate, signal);
} }
@@ -467,7 +467,8 @@ void CStreamInfo2::paint (int mode)
void CStreamInfo2::paint_techinfo(int xpos, int ypos) void CStreamInfo2::paint_techinfo(int xpos, int ypos)
{ {
char buf[100], buf2[100]; char buf[100];
//, buf2[100];
int xres, yres, aspectRatio, framerate; int xres, yres, aspectRatio, framerate;
// paint labels // paint labels
int spaceoffset = 0,i = 0; int spaceoffset = 0,i = 0;
@@ -571,8 +572,8 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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
} }
CChannelList *channelList = CNeutrinoApp::getInstance ()->channelList; CChannelList *channelList = CNeutrinoApp::getInstance ()->channelList;
int curnum = channelList->getActiveChannelNumber(); // int curnum = channelList->getActiveChannelNumber();
CZapitChannel * channel = channelList->getChannel(curnum); // CZapitChannel * channel = channelList->getChannel(curnum);
CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo (); CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo ();
//channel //channel
@@ -587,7 +588,12 @@ 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);
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=="DVB-S2"?"S2":"S1"); if (!strncmp(s,const_cast<char *>("DVB-S2"),6))
s=const_cast<char *>("S2");
else
s=const_cast<char *>("S1");
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
} }
@@ -634,8 +640,8 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
if (g_RemoteControl->current_PIDs.APIDs.empty()){ if (g_RemoteControl->current_PIDs.APIDs.empty()){
sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE)); sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
} else { } else {
unsigned int i=0,j=0,sw=spaceoffset; unsigned int sw=spaceoffset;
for (i= 0; (i<g_RemoteControl->current_PIDs.APIDs.size()) && (i<10); i++) for (unsigned int i= 0; (i<g_RemoteControl->current_PIDs.APIDs.size()) && (i<10); i++)
{ {
sprintf((char*) buf, "0x%04x (%i)", g_RemoteControl->current_PIDs.APIDs[i].pid, g_RemoteControl->current_PIDs.APIDs[i].pid ); sprintf((char*) buf, "0x%04x (%i)", g_RemoteControl->current_PIDs.APIDs[i].pid, g_RemoteControl->current_PIDs.APIDs[i].pid );
if (i == g_RemoteControl->current_PIDs.PIDs.selected_apid){ if (i == g_RemoteControl->current_PIDs.PIDs.selected_apid){
@@ -773,7 +779,7 @@ void CStreamInfo2::showSNR ()
{ {
char percent[10]; char percent[10];
int barwidth = 150; int barwidth = 150;
uint16_t ssig, ssnr; // uint16_t ssig, ssnr;
int sig, snr; int sig, snr;
int posx, posy; int posx, posy;
int sw; int sw;