From 1ebd4df379f0c7c4bcab81d84bd6cca3a28f1b25 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 26 Aug 2016 20:02:43 +0200 Subject: [PATCH] streaminfo2: fix merge error Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/675ef26065346f171f8c00905ddde4a6fd37ace7 Author: vanhofen Date: 2016-08-26 (Fri, 26 Aug 2016) Origin message was: ------------------ - streaminfo2: fix merge error ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/streaminfo2.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index a410be4e8..95fb0ab79 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -152,10 +152,12 @@ int CStreamInfo2::doSignalStrengthLoop () int dx1 = x + 10; ts_setup (); while (1) { +#if 0 neutrino_msg_data_t data; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100); g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd); +#endif if (!mp) { signal.sig = frontend->getSignalStrength() & 0xFFFF; @@ -169,7 +171,6 @@ int CStreamInfo2::doSignalStrengthLoop () if (cnt < 12) cnt++; //NI int dheight = g_Font[font_info]->getHeight (); - int dx1 = x + 10; if(!mp && delay_counter > delay + 1){ CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();