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

Revert "neutrino: fix infobar display with disabled timeout"

Browse Source 
This reverts commit 69ca4a90a9.


Origin commit data
------------------
Commit: c1e7aa4184
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-05 (Mon, 05 Feb 2018)
This commit is contained in:
vanhofen
2018-02-05 23:47:24 +01:00
parent 69ca4a90a9
commit e2661e4dcd
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/neutrino.cpp
View File

@@ -4,7 +4,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
and some other guys and some other guys
Copyright (C) 2006-2018 Stefan Seyfried Copyright (C) 2006-2017 Stefan Seyfried
Copyright (C) 2011 CoolStream International Ltd Copyright (C) 2011 CoolStream International Ltd
@@ -3088,15 +3088,12 @@ void CNeutrinoApp::RealRun()
else if( ( msg == CRCInput::RC_help ) || ( msg == CRCInput::RC_info) || else if( ( msg == CRCInput::RC_help ) || ( msg == CRCInput::RC_info) ||
( msg == NeutrinoMessages::SHOW_INFOBAR ) ) ( msg == NeutrinoMessages::SHOW_INFOBAR ) )
{ {
#if 0
bool enabled_by_timing = ( bool enabled_by_timing = (
((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] != 0) ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] != 0)
|| ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] != 0) || ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] != 0)
); );
bool show_info = ((msg != NeutrinoMessages::SHOW_INFOBAR) || (g_InfoViewer->is_visible || enabled_by_timing)); bool show_info = ((msg != NeutrinoMessages::SHOW_INFOBAR) || (g_InfoViewer->is_visible || enabled_by_timing));
#else
const bool show_info = true;
#endif
// turn on LCD display // turn on LCD display
CVFD::getInstance()->wake_up(); CVFD::getInstance()->wake_up();