From 70237dc67552afea152dc2933ebc4f93cc97e0cc Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Thu, 28 Feb 2013 21:31:48 +0000 Subject: Add 2 second pre-dim and bugfix blank timer 2 second predim code courtesy of bigbiff Change-Id: I052ac422f78dc82c05f58c188587534b800b935a --- gui/blanktimer.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gui/blanktimer.hpp') diff --git a/gui/blanktimer.hpp b/gui/blanktimer.hpp index 4135635f8..2d83c4dae 100644 --- a/gui/blanktimer.hpp +++ b/gui/blanktimer.hpp @@ -32,8 +32,7 @@ class blanktimer { void setTime(int newtime); private: - void setBlank(int blank); - int getBlank(void); + void setConBlank(int blank); void setTimer(void); timespec getTimer(void); int getBrightness(void); @@ -42,13 +41,12 @@ class blanktimer { int setClockTimer(void); typedef int (blanktimer::*ThreadPtr)(void); typedef void* (*PThreadPtr)(void*); - pthread_mutex_t blankmutex; + pthread_mutex_t conblankmutex; pthread_mutex_t timermutex; int conblank; timespec btimer; unsigned long long sleepTimer; int orig_brightness; - int blanked; }; extern blanktimer blankTimer; -- cgit v1.2.3