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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
This commit is contained in:
vanhofen
2017-10-18 09:53:55 +02:00
parent 57e1571833 f5bea1c0cd
commit 9d1691fb8d
10 changed files with 23258 additions and 34020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/streaminfo2.cpp
View File

@@ -148,7 +148,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
int cnt = 0;
int delay_counter = 0;
const int delay = 15;
int sw = g_Font[font_info]->getRenderWidth ("99999.999");
int sw = g_Font[font_info]->getRenderWidth("99999.999");
maxb = minb = lastb = tmp_rate = 0;
std::string br_str = std::string(g_Locale->getText(LOCALE_STREAMINFO_BITRATE)) + ":";
std::string avg_str = "(" + std::string(g_Locale->getText(LOCALE_STREAMINFO_AVERAGE_BITRATE)) + ")";
@@ -194,7 +194,6 @@ int CStreamInfo2::doSignalStrengthLoop ()
if (cnt < 12)
cnt++;
//NI int dheight = g_Font[font_info]->getHeight ();
if(!mp && delay_counter > delay + 1){
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
@@ -204,6 +203,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
delay_counter = 0;
}
}
if (ret && (lastb != bit_s)) {
lastb = bit_s;