From 190454320743512408deee294179f31d774f2657 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 3 Aug 2018 22:58:24 +0200
Subject: [PATCH] screensaver: move code for ignored msgs to screensaver code

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/5395c047f5c83795964c156b7459475ae9e3a794
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-03 (Fri, 03 Aug 2018)

Origin message was:
------------------
- screensaver: move code for ignored msgs to screensaver code
---
 src/gui/screensaver.cpp | 17 +++++++++++++++++
 src/gui/screensaver.h   |  1 +
 src/neutrino.cpp        | 13 +------------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp
index 861de4ed0..8f41ecd5b 100644
--- a/src/gui/screensaver.cpp
+++ b/src/gui/screensaver.cpp
@@ -377,3 +377,20 @@ bool CScreenSaver::isActive()
 		return true;
 	return false;
 }
+
+bool CScreenSaver::ignoredMsg(neutrino_msg_t msg)
+{
+	/* screensaver will ignore these msgs */
+	if (
+		   msg == NeutrinoMessages::EVT_CURRENTEPG
+		|| msg == NeutrinoMessages::EVT_NEXTEPG
+		|| msg == NeutrinoMessages::EVT_CURRENTNEXT_EPG
+		|| msg == NeutrinoMessages::EVT_TIMESET
+		|| msg == NeutrinoMessages::EVT_PROGRAMLOCKSTATUS
+		|| msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES
+		|| msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS
+		|| msg == NeutrinoMessages::EVT_ZAP_GOTPIDS
+	)
+		return true;
+	return false;
+}
diff --git a/src/gui/screensaver.h b/src/gui/screensaver.h
index 716e874df..9e2070048 100644
--- a/src/gui/screensaver.h
+++ b/src/gui/screensaver.h
@@ -74,6 +74,7 @@ class CScreenSaver : public sigc::trackable
 		bool isActive();
 		void Start();
 		void Stop();
+		bool ignoredMsg(neutrino_msg_t msg);
 		sigc::signal<void> OnBeforeStart;
 		sigc::signal<void> OnAfterStop;
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e2a98360f..3676290f3 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2871,17 +2871,6 @@ void CNeutrinoApp::RealRun()
 		if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio)
 #endif
 		{
-			bool ignored_msg = (
-				/* radio screensaver will ignore this msgs */
-				   msg == NeutrinoMessages::EVT_CURRENTEPG
-				|| msg == NeutrinoMessages::EVT_NEXTEPG
-				|| msg == NeutrinoMessages::EVT_CURRENTNEXT_EPG
-				|| msg == NeutrinoMessages::EVT_TIMESET
-				|| msg == NeutrinoMessages::EVT_PROGRAMLOCKSTATUS
-				|| msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES
-				|| msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS
-				|| msg == NeutrinoMessages::EVT_ZAP_GOTPIDS
-			);
 			if (msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER)
 			{
 				if (CScreenSaver::getInstance()->canStart() && !CScreenSaver::getInstance()->isActive())
@@ -2890,7 +2879,7 @@ void CNeutrinoApp::RealRun()
 					CScreenSaver::getInstance()->Start();
 				}
 			}
-			else if (!ignored_msg)
+			else if (!CScreenSaver::getInstance()->ignoredMsg(msg))
 			{
 				if (CScreenSaver::getInstance()->isActive())
 				{