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

streaminfo2: fix merge error

Browse Source 
Origin commit data
------------------
Commit: 675ef26065
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- streaminfo2: fix merge error
This commit is contained in:
vanhofen
2016-08-26 20:02:43 +02:00
parent bc33663742
commit b61315b6a9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/streaminfo2.cpp
View File

@@ -152,10 +152,12 @@ int CStreamInfo2::doSignalStrengthLoop ()
int dx1 = x + 10; int dx1 = x + 10;
ts_setup (); ts_setup ();
while (1) { while (1) {
#if 0
neutrino_msg_data_t data; neutrino_msg_data_t data;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS (100);
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
#endif
if (!mp) { if (!mp) {
signal.sig = frontend->getSignalStrength() & 0xFFFF; signal.sig = frontend->getSignalStrength() & 0xFFFF;
@@ -169,7 +171,6 @@ int CStreamInfo2::doSignalStrengthLoop ()
if (cnt < 12) if (cnt < 12)
cnt++; cnt++;
//NI int dheight = g_Font[font_info]->getHeight (); //NI int dheight = g_Font[font_info]->getHeight ();
int dx1 = x + 10;
if(!mp && delay_counter > delay + 1){ if(!mp && delay_counter > delay + 1){
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel(); CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();