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

streaminfo: fix merge error

Browse Source 
Origin commit data
------------------
Commit: 11eac4a843
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: fix merge error
This commit is contained in:
vanhofen
2017-11-06 00:26:34 +01:00
parent ff3480e637
commit cf431b1c92
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/streaminfo2.cpp
View File

@@ -157,32 +157,6 @@ int CStreamInfo2::doSignalStrengthLoop ()
int dx1 = x + 10;
ts_setup ();
while (1) {
neutrino_msg_data_t data;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100);
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
{
if (fader.FadeDone())
{
break;
}
continue;
}
if (fadeout && msg == CRCInput::RC_timeout)
{
if (fader.StartFadeOut())
{
msg = 0;
continue;
}
else
{
break;
}
}
if (!mp) {
signal.sig = frontend->getSignalStrength() & 0xFFFF;
signal.snr = frontend->getSignalNoiseRatio() & 0xFFFF;
@@ -258,6 +232,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
signal.old_snr = signal.snr;
signal.old_ber = signal.ber;
neutrino_msg_data_t data;
/* rate limiting is done in update_rate */
g_RCInput->getMsg_us(&msg, &data, 0);