From 1a56a8ed0df8e50f13d91d0f1c6de4cd0be12d9f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 13 Jun 2011 14:16:42 +0000 Subject: [PATCH] streaminfo2:-fix osd git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1538 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0d8febb9f690e3b430a48b1e3d4d785dd2812e6e Author: Jacek Jendrzej Date: 2011-06-13 (Mon, 13 Jun 2011) ------------------ This commit was generated by Migit --- src/gui/streaminfo2.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index c35e2015e..65ba9e572 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -1058,7 +1058,8 @@ void CStreamInfo2::showSNR () // uint16_t ssig, ssnr; int sig, snr; int posx, posy; - int sw; + int sw = g_Font[font_info]->getRenderWidth ("100%"); + int pw = g_Font[font_info]->getRenderWidth (" SNR"); snr = (signal.snr & 0xFFFF) * 100 / 65535; sig = (signal.sig & 0xFFFF) * 100 / 65535; @@ -1068,24 +1069,24 @@ void CStreamInfo2::showSNR () lastsig = sig; posy = yypos + (mheight/2)-5; posx = x + 10; - sprintf(percent, "%d%% SIG", sig); - sw = g_Font[font_info]->getRenderWidth (percent); + sprintf(percent, "%d%%", sig); sigscale->paintProgressBar2(posx - 1, posy, sig); posx = posx + barwidth + 3; frameBuffer->paintBoxRel(posx, posy -1, sw, mheight-8, COL_MENUHEAD_PLUS_0); - g_Font[font_info]->RenderString (posx+2, posy + mheight-5, sw, percent, COL_INFOBAR); + g_Font[font_info]->RenderString (posx + 2, posy + mheight-5, sw, percent, COL_INFOBAR); + g_Font[font_info]->RenderString (posx + 2 + sw, posy + mheight-5, pw, "SIG", COL_INFOBAR); } if (lastsnr != snr) { lastsnr = snr; posy = yypos + mheight + 5; posx = x + 10; sprintf(percent, "%d%% SNR", snr); - sw = g_Font[font_info]->getRenderWidth (percent); snrscale->paintProgressBar2(posx - 1, posy+2, snr); posx = posx + barwidth + 3; frameBuffer->paintBoxRel(posx, posy - 1, sw, mheight-8, COL_MENUHEAD_PLUS_0, 0, true); g_Font[font_info]->RenderString (posx + 2, posy + mheight-5, sw, percent, COL_INFOBAR, 0, true); + g_Font[font_info]->RenderString (posx + 2 + sw, posy + mheight-5, pw, "SNR", COL_INFOBAR, 0, true); } }