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

Merge branch 'check/pu-cc' into master

Browse Source 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
This commit is contained in:
Stefan Seyfried
2013-04-06 14:28:16 +02:00
parent 619d1f2c69 32075530f5
commit f0f32ff08f
42 changed files with 861 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/streaminfo2.cpp
View File

@@ -121,8 +121,13 @@ int CStreamInfo2::doSignalStrengthLoop ()
#define BAR_WIDTH 150
#define BAR_HEIGHT 12
int res = menu_return::RETURN_REPAINT;
sigscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
sigscale = new CProgressBar();
sigscale->setBlink();
snrscale = new CProgressBar();
snrscale->setBlink();
lastsnr = lastsig = -1;
neutrino_msg_t msg;
@@ -919,7 +924,8 @@ void CStreamInfo2::showSNR ()
posy = yypos + (mheight/2)-5;
posx = x + 10;
sprintf(percent, "%d%%", sig);
sigscale->paintProgressBar2(posx - 1, posy, sig);
sigscale->setProgress(posx - 1, posy, BAR_WIDTH, BAR_HEIGHT, sig, 100);
sigscale->paint();
posx = posx + barwidth + 3;
frameBuffer->paintBoxRel(posx, posy -1, sw, mheight-8, COL_MENUHEAD_PLUS_0);
@@ -931,7 +937,9 @@ void CStreamInfo2::showSNR ()
posy = yypos + mheight + 5;
posx = x + 10;
sprintf(percent, "%d%% SNR", snr);
snrscale->paintProgressBar2(posx - 1, posy+2, snr);
snrscale->setProgress(posx - 1, posy+2, BAR_WIDTH, BAR_HEIGHT, snr, 100);
snrscale->paint();
// 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);