From cf431b1c92f05e7036eb473581508db36429c989 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 6 Nov 2017 00:26:34 +0100 Subject: [PATCH] streaminfo: fix merge error Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/11eac4a843bdc94e0ab4d134aa3847a26b615036 Author: vanhofen Date: 2017-11-06 (Mon, 06 Nov 2017) Origin message was: ------------------ - streaminfo: fix merge error --- src/gui/streaminfo2.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index bb0f7b98f..2739b52d0 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -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);