display: remove usage of deviced API

Replace usage of private deviced API usage with
capi-system-device public API.

Change-Id: Iac04ebe2c7831aa096063aa459d5d69059f54eb2

diff --git a/setting-display/CMakeLists.txt b/setting-display/CMakeLists.txt
index a67e5922fe5262c587194354d8d24aa01b7b0139..6b01769fb9f24ff210d7c8793888fbd4ffd7b7cc 100755 (executable)
--- a/setting-display/CMakeLists.txt
+++ b/setting-display/CMakeLists.txt
@@ -6,7 +6,6 @@ SET(SETTING_PKG_DISPLAY "org.tizen.setting-display")
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_display REQUIRED elementary
                                capi-appfw-application
-                               deviced
                                glib-2.0
                                dlog
                                capi-system-device

diff --git a/setting-display/include/setting-display.h b/setting-display/include/setting-display.h
index 49fd32b7bfbc3c095e729779a1c7f407a818a00e..a39f128e52de9f8b25172cd796aee9e69cff12b9 100644 (file)
--- a/setting-display/include/setting-display.h
+++ b/setting-display/include/setting-display.h
@@ -37,8 +37,7 @@
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>
 
-#include <device.h>
-#include <dd-display.h>
+#include <device/display.h>
 #include <dbus/dbus.h>
 
 #define Keystr_Dynamic         "IDS_ST_BODY_DYNAMIC_T_DISPLAY_EFFECT"

diff --git a/setting-display/src/setting-display-brightness.c b/setting-display/src/setting-display-brightness.c
index 86547d700d2c966e95a0f3c740e4da5983569eba..d8efcc39142f15b04cc1d7a77b89f4641fdf7984 100755 (executable)
--- a/setting-display/src/setting-display-brightness.c
+++ b/setting-display/src/setting-display-brightness.c
@@ -31,6 +31,7 @@
 #define BRIGHTNESS_MIN 1
 #define BRIGHTNESS_AUTO_MAX_LEVEL 5
 #define BRIGHTNESS_AUTO_MIN_LEVEL -5
+#define DEFAULT_DISPLAY_NO 0
 
 static void setting_display_birghtness_bright_slider_value_change_cb(
                void *data, Evas_Object *obj, void *event_info);
@@ -69,6 +70,42 @@ const char *iconPath[SETTING_DISPLAY_ICON_PATH] = {
        SETTING_ICON_PATH_CFG"brightness_icon/settings_ic_brightness_11.png"
 };
 
+/**
+ * Get max brightness from default display or return default
+ * max brightness on error.
+ */
+static int settings_display_util_get_max_brightness()
+{
+       int max, err;
+
+       err = device_display_get_max_brightness(DEFAULT_DISPLAY_NO, &max);
+       if (err != DEVICE_ERROR_NONE) {
+               SETTING_TRACE_ERROR(
+                               "device_display_get_max_brightness failed: %s,"
+                               "return default max brightness: %d",
+                               get_error_message(err), BRIGHTNESS_MAX);
+               return BRIGHTNESS_MAX;
+       }
+
+       return max;
+}
+
+/**
+ * Set brightness on default display.
+ * Returns 0 on success, other value on error.
+ */
+static int settings_display_util_set_brightness(int value)
+{
+       int err = device_display_set_brightness(DEFAULT_DISPLAY_NO, value);
+       if (err != DEVICE_ERROR_NONE) {
+               SETTING_TRACE_ERROR(
+                               "device_display_set_brightness failed: %s",
+                               get_error_message(err));
+               return -1;
+       }
+       return 0;
+}
+
 static void update_overheating_text(void *data)
 {
        SettingDisplay *ad = (SettingDisplay *)data;
@@ -128,8 +165,7 @@ static DBusHandlerResult setting_brightness_dbus_signal_filter(
                vconf_get_int(VCONFKEY_SETAPPL_BRIGHTNESS_AUTOMATIC_INT,
                                &value);
                if (!value && ad->data_br_sli) {
-                       ad->data_br_sli->slider_max =
-                                       display_get_max_brightness();
+                       ad->data_br_sli->slider_max = settings_display_util_get_max_brightness();
                        SETTING_TRACE("brightness_level:%d",
                                        brightness_level);
                        SETTING_TRACE("Brightness max value:%lf",
@@ -341,7 +377,7 @@ static void _brightness_overheat_check(void *data)
 
        value = ad->last_requested_level;
 
-       max_brightness = display_get_max_brightness();
+       max_brightness = settings_display_util_get_max_brightness();
 
        if (
                        value > max_brightness
@@ -517,20 +553,16 @@ void __display_int_vconf_cb(keynode_t *key, void *data)
                                        &val, &err);
                        if (ad->data_br_sli) {
                                ad->data_br_sli->slider_min = BRIGHTNESS_MIN;
-                               ad->data_br_sli->slider_max =
-                                               display_get_max_brightness();
-                               /*device_display_get_max_brightness(0,
-                                * (int*)&ad->data_br_sli->slider_max); */
+                               ad->data_br_sli->slider_max = settings_display_util_get_max_brightness();
                                ad->data_br_sli->chk_status = val;
                                elm_object_item_data_set(ad->data_br_sli->item,
                                                ad->data_br_sli);
                                elm_genlist_item_update(ad->data_br_sli->item);
                        }
 
-                       err = display_set_brightness_with_setting(val);
-                       if (err != DEVICE_ERROR_NONE) {
-                               SETTING_TRACE(" device_display_set_brightness "
-                                               ": failed[ret=%d]", err);
+                       err = settings_display_util_set_brightness(val);
+                       if (err != 0) {
+                               SETTING_TRACE(" settings_display_util_set_brightness failed.");
                                setting_create_popup(ad, ad->md.window, NULL,
                                                "IDS_CST_POP_FAILED",
                                                NULL, POPUP_INTERVAL, FALSE,
@@ -719,8 +751,7 @@ void construct_brightness(void *data, Evas_Object *genlist)
                } else {
                        ad->data_br_sli->isIndicatorVisible = 0;
                        ad->data_br_sli->slider_min = BRIGHTNESS_MIN;
-                       ad->data_br_sli->slider_max =
-                                       display_get_max_brightness();
+                       ad->data_br_sli->slider_max = settings_display_util_get_max_brightness();
                }
                ad->data_br_sli->userdata = ad;
 
@@ -779,16 +810,15 @@ static void setting_display_set_slider_value(
        if (!safeStrCmp(vconf_str, VCONFKEY_SETAPPL_LCD_BRIGHTNESS)) {
                int ret, err;
 
-               ret = display_set_brightness_with_setting(value);
-               if (ret == DEVICE_ERROR_NONE) {
+               ret = settings_display_util_set_brightness(value);
+               if (ret == 0) {
 
                        ad->data_br_sli->chk_status = (int)value;
                        SETTING_TRACE("value:%f", value);
                } else {
                        /*rollback.. */
                        int tmp = SETTING_BRIGHTNESS_LEVEL5;
-                       SETTING_TRACE(" device_display_set_brightness : "
-                                       "failed[ret=%d]", ret);
+                       SETTING_TRACE(" settings_display_util_set_brightness failed.");
                        setting_get_int_slp_key(INT_SLP_SETTING_LCD_BRIGHTNESS,
                                        &tmp, &err);
                        vconf_get_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, &tmp);