From 28ec6bc669efeeb20b6276e44202984ed123222c Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 27 Dec 2011 19:29:17 +0000 Subject: [PATCH] vfd: use wake_up instead of setMode for turn on LCD git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2009 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3c29473e7f7b555106f89af47615c6483aca0149 Author: Jacek Jendrzej Date: 2011-12-27 (Tue, 27 Dec 2011) ------------------ This commit was generated by Migit --- src/driver/vfd.cpp | 1 + src/driver/vfd.h | 2 +- src/neutrino.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index 15d8eafa0..5db9a4a14 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -101,6 +101,7 @@ void CVFD::count_down() { } void CVFD::wake_up() { + if(!has_lcd) return; if (atoi(g_settings.lcd_setting_dim_time) > 0) { timeout_cnt = atoi(g_settings.lcd_setting_dim_time); g_settings.lcd_setting_dim_brightness > -1 ? diff --git a/src/driver/vfd.h b/src/driver/vfd.h index 59c516ca6..4bbe70e60 100644 --- a/src/driver/vfd.h +++ b/src/driver/vfd.h @@ -90,7 +90,6 @@ class CVFD int brightness; char text[256]; - void wake_up(); void count_down(); CVFD(); @@ -145,6 +144,7 @@ class CVFD void Clear(); void ShowIcon(vfd_icon icon, bool show); void ShowText(const char *str); + void wake_up(); MODES getMode(void) { return mode; }; #ifdef LCD_UPDATE private: diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 805906cbc..56651b26d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2141,7 +2141,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) { bool show_info = ((msg != NeutrinoMessages::SHOW_INFOBAR) || (g_InfoViewer->is_visible || g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] != 0)); // turn on LCD display - CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); + CVFD::getInstance()->wake_up(); // show Infoviewer if(show_info && channelList->getSize()) {