From fc966505e518ba690e654dd5b397f74915571cc8 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 16 Apr 2014 13:30:45 -0500 Subject: Make blank timer read brightness path from data manager After implementing the find_file class, the blank timer code needed to be updated to pull the brightness path from the data manager instead of using the build flag to ensure that we use the proper path for brightness. Change-Id: I084983ac0bd68b2fcdd69b93c2d18e2862ba0c77 --- gui/Android.mk | 8 -------- gui/blanktimer.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gui/Android.mk b/gui/Android.mk index 4ad558a01..0f20f16bf 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -51,14 +51,6 @@ endif ifneq ($(TW_EXTERNAL_STORAGE_PATH),) LOCAL_CFLAGS += -DTW_EXTERNAL_STORAGE_PATH=$(TW_EXTERNAL_STORAGE_PATH) endif -ifneq ($(TW_BRIGHTNESS_PATH),) - LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH) -endif -ifneq ($(TW_MAX_BRIGHTNESS),) - LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=$(TW_MAX_BRIGHTNESS) -else - LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=255 -endif ifneq ($(TW_NO_SCREEN_BLANK),) LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK endif diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp index c8d1bcc28..383b15724 100644 --- a/gui/blanktimer.cpp +++ b/gui/blanktimer.cpp @@ -117,7 +117,8 @@ int blanktimer::setClockTimer(void) { int blanktimer::getBrightness(void) { string results; - string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + string brightness_path; + DataManager::GetValue("tw_brightness_file", brightness_path); if ((TWFunc::read_file(brightness_path, results)) != 0) return -1; int result = atoi(results.c_str()); @@ -135,9 +136,10 @@ int blanktimer::getBrightness(void) { } int blanktimer::setBrightness(int brightness) { - string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + string brightness_path; string bstring; char buff[100]; + DataManager::GetValue("tw_brightness_file", brightness_path); sprintf(buff, "%d", brightness); bstring = buff; if ((TWFunc::write_file(brightness_path, bstring)) != 0) -- cgit v1.2.3