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

neutrino: consolidate CScale and CProgressBar code

Browse Source 
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
      check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-01-03 10:39:40 +00:00
parent cc446a1fd2
commit 697e3c6756
17 changed files with 325 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/streaminfo2.cpp
View File

@@ -135,14 +135,10 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
int CStreamInfo2::doSignalStrengthLoop ()
{
#define RED_BAR 40
#define YELLOW_BAR 70
#define GREEN_BAR 100
#define BAR_WIDTH 150
#define BAR_HEIGHT 12
sigscale = new CScale(BAR_WIDTH, BAR_HEIGHT, RED_BAR, GREEN_BAR, YELLOW_BAR);
snrscale = new CScale(BAR_WIDTH, BAR_HEIGHT, RED_BAR, GREEN_BAR, YELLOW_BAR);
sigscale = new CProgressBar(BAR_WIDTH, BAR_HEIGHT);
snrscale = new CProgressBar(BAR_WIDTH, BAR_HEIGHT);
neutrino_msg_t msg;
unsigned long long maxb, minb, lastb, tmp_rate;
@@ -246,6 +242,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
sigscale->reset();
if(snrscale)
snrscale->reset();
lastsnr = lastsig = -1;
paint_mode = ++paint_mode % 2;
paint (paint_mode);
continue;
@@ -788,23 +785,25 @@ void CStreamInfo2::showSNR ()
sig = (signal.sig & 0xFFFF) * 100 / 65535;
int mheight = g_Font[font_info]->getHeight();
if(sigscale->getPercent() != sig) {
posy = yypos + (mheight/2);
if (lastsig != sig) {
lastsig = sig;
posy = yypos + (mheight/2);
posx = x + 10;
sprintf(percent, "%d%% SIG", sig);
sw = g_Font[font_info]->getRenderWidth (percent);
sigscale->paint(posx - 1, posy, 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_MENUCONTENTDARK);
}
if(snrscale->getPercent() != snr) {
posy = yypos + mheight + 4;
if (lastsnr != snr) {
lastsnr = snr;
posy = yypos + mheight + 4;
posx = x + 10;
sprintf(percent, "%d%% SNR", snr);
sw = g_Font[font_info]->getRenderWidth (percent);
snrscale->paint(posx - 1, posy+2, snr);
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);