From 64cb0c946eca2dda1d681d701840ca500e897f0a Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 11 Feb 2010 13:27:49 +0000 Subject: [PATCH] fix graphic bugs git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@315 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0fd5b154d4358a9269bb679bd7f57bc77c1548a5 Author: Jacek Jendrzej Date: 2010-02-11 (Thu, 11 Feb 2010) Origin message was: ------------------ -fix graphic bugs git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@315 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/screensetup.cpp | 2 +- src/gui/streaminfo2.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp index c48b08fa6..51049b6f5 100644 --- a/src/gui/screensetup.cpp +++ b/src/gui/screensetup.cpp @@ -134,7 +134,7 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) frameBuffer->paintBoxRel(x_box, y_box, BoxWidth, BoxHeight, (selected == 0)?COL_MENUCONTENTSELECTED_PLUS_0:COL_MENUCONTENT_PLUS_0); - frameBuffer->paintBoxRel(x_box, y_box, y_box + BoxHeight, BoxWidth, BoxHeight, + frameBuffer->paintBoxRel(x_box, y_box + BoxHeight, BoxWidth, BoxHeight, (selected ==1 )?COL_MENUCONTENTSELECTED_PLUS_0:COL_MENUCONTENT_PLUS_0); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_box + 30, y_box + BoxHeight, BoxWidth, diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index bb604afb2..0ff47eeb6 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -186,7 +186,7 @@ int CStreamInfo2::doSignalStrengthLoop () for(i = 0; i < 3; i++){ switch (i) { case 0: - tmp_rate = bit_s; + tmp_rate = rate.short_average; sprintf(tmp_str, "%s", g_Locale->getText(LOCALE_STREAMINFO_BITRATE)); offset_tmp = 0; break; @@ -308,7 +308,7 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h) g_Font[font_small]->RenderString(_x+28+xd*2, y2, 50, "SIG", COL_MENUCONTENTDARK, 0, true); frameBuffer->paintBoxRel(_x+xd*3,y2- 12,16,2,COL_YELLOW); // near yellow - g_Font[font_small]->RenderString(_x+20+xd*3, y2, 50, "Bitrate", COL_MENUCONTENTDARK, 0, true); + g_Font[font_small]->RenderString(_x+20+xd*3, y2, 70, "Bitrate", COL_MENUCONTENTDARK, 0, true); sig_text_y = y1 - iheight; sig_text_ber_x = _x + xd * 0; @@ -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.min_short_average/ 1000ULL, sig_text_rate_x, yt); if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){ - yd = y_signal_fe (value, 15000, sigBox_h);// Video + Audio + yd = y_signal_fe (value, 20000, sigBox_h);// Video + Audio } else { yd = y_signal_fe (value, 512, sigBox_h); // Audio only } @@ -596,7 +596,7 @@ 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 } else if(frontend->getInfo()->type == FE_QAM) { - sprintf((char*) buf, "%d.%d MHz", si.tsfrequency/1000000, si.tsfrequency%1000); + sprintf((char*) buf, "%d.%d MHz", si.tsfrequency/1000, si.tsfrequency%1000); 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 }