From fb759d45f5c95e3184ffc9c35b57a0a463a6d1ab Mon Sep 17 00:00:00 2001
From: that <github@that.at>
Date: Sun, 11 Jan 2015 12:16:53 +0100
Subject: gui: simplify blanktimer

- get rid of separate thread, check timer in rendering thread instead
- use an enum for the blanking state instead of magic integers
- move #ifdefs for TW_NO_SCREEN_TIMEOUT inside blanktimer class
- move some #includes and enum TOUCH_STATE to pages.hpp

Change-Id: Id4b104e3680dc5db41d8ba85e32d722cf4086299
---
 gui/pages.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'gui/pages.cpp')

diff --git a/gui/pages.cpp b/gui/pages.cpp
index a1a6346a4..aae85aec9 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -45,14 +45,9 @@ extern "C" {
 
 #include "rapidxml.hpp"
 #include "objects.hpp"
-#ifndef TW_NO_SCREEN_TIMEOUT
 #include "blanktimer.hpp"
-#endif
 
 extern int gGuiRunning;
-#ifndef TW_NO_SCREEN_TIMEOUT
-extern blanktimer blankTimer;
-#endif
 
 std::map<std::string, PageSet*> PageManager::mPageSets;
 PageSet* PageManager::mCurrentSet;
@@ -1197,10 +1192,8 @@ void PageManager::LoadCursorData(xml_node<>* node)
 
 int PageManager::Update(void)
 {
-#ifndef TW_NO_SCREEN_TIMEOUT
-	if(blankTimer.IsScreenOff())
+	if(blankTimer.isScreenOff())
 		return 0;
-#endif
 
 	int res = (mCurrentSet ? mCurrentSet->Update() : -1);
 
-- 
cgit v1.2.3