Use capi-system-device APIs instead of deviced

Change-Id: I46aa4387cf44c74285d26e97200a7d2cf6ac586a
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 319e733..3a36769 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ COMMON_CFLAGS = -I${srcdir}/lib/include \
                $(SYSTEM_INFO_CFLAGS) \
                $(SMACK_CFLAGS) \
                $(USB_DEVICE_CFLAGS) \
-               $(PHONESTATUS_CFLAGS)
+               $(PHONESTATUS_CFLAGS) \
+               $(SYSTEM_DEVICE_CFLAGS)
 
 if USE_NOTIFICATION
 COMMON_CFLAGS += $(STATUS_CFLAGS)
@@ -41,6 +42,7 @@ COMMON_LDADD =        libmedia-utils.la \
                $(LIBSYSTEMDLOGIN_LIBS) \
                $(SECURITY_LIBS) \
                $(SYSTEM_INFO_LIBS) \
+               $(SYSTEM_DEVICE_LIBS) \
                $(SMACK_LIBS) \
                $(USB_DEVICE_LIBS) \
                -ldl
@@ -124,7 +126,6 @@ media_server_CFLAGS = -I${srcdir}/src/server/include \
 
 media_server_CFLAGS += $(SQLITE3_CFLAGS) \
                                           $(USB_DEVICE_CFLAGS) \
-                                          $(DEVICED_CFLAGS) \
                                           $(POWER_DEFS_CFLAGS) \
                                           $(POWER_TV_CFLAGS)
 
@@ -138,7 +139,6 @@ media_server_LDADD = $(COMMON_LDADD) \
 
 media_server_LDADD += $(SECURITY_LIBS) \
                              $(USB_DEVICE_LIBS) \
-                              $(DEVICED_LIBS) \
                               $(POWER_DEFS_LIBS) \
                               $(POWER_TV_LIBS)
 
@@ -181,7 +181,6 @@ media_scanner_v2_CFLAGS = -I${srcdir}/src/scanner-v2/include \
                           $(COMMON_CFLAGS)
 
 media_scanner_v2_CFLAGS += $(USB_DEVICE_CFLAGS) \
-                                                  $(DEVICED_CFLAGS) \
                                                   $(POWER_DEFS_CFLAGS) \
                                                   $(POWER_TV_CFLAGS)
 
@@ -192,7 +191,6 @@ media_scanner_v2_LDFLAGS = -pie
 media_scanner_v2_LDADD = $(COMMON_LDADD)
 
 media_scanner_v2_LDADD += $(USB_DEVICE_LIBS) \
-                          $(DEVICED_LIBS) \
                           $(POWER_DEFS_LIBS) \
                           $(POWER_TV_LIBS)
 

diff --git a/configure.ac b/configure.ac
index 43840e1..3513486 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(PHONESTATUS, vconf)
 AC_SUBST(PHONESTATUS_CFLAGS)
 AC_SUBST(PHONESTATUS_LIBS)
 
-PKG_CHECK_MODULES(LIBPMCONTROL, deviced)
-AC_SUBST(LIBPMCONTROL_CFLAGS)
-AC_SUBST(LIBPMCONTROL_LIBS)
-
 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
@@ -129,6 +125,11 @@ PKG_CHECK_MODULES(SYSTEM_INFO, capi-system-info)
 AC_SUBST(SYSTEM_INFO_CFLAGS)
 AC_SUBST(SYSTEM_INFO_LIBS)
 
+#capi-system-device
+PKG_CHECK_MODULES(SYSTEM_DEVICE, capi-system-device)
+AC_SUBST(SYSTEM_DEVICE_CFLAGS)
+AC_SUBST(SYSTEM_DEVICE_LIBS)
+
 dnl use notification --------------------------------------------------------------------------
 AC_ARG_ENABLE(notification, AC_HELP_STRING([--enable-notification], [using notification]),
 [
@@ -146,11 +147,6 @@ if test "x$USE_NOTIFICATION" = "xyes"; then
 fi
 AM_CONDITIONAL(USE_NOTIFICATION, test "x$USE_NOTIFICATION" = "xyes")
 
-#deviced
-PKG_CHECK_MODULES(DEVICED, deviced)
-AC_SUBST(DEVICED_CFLAGS)
-AC_SUBST(DEVICE_LIBS)
-
 AC_ARG_ENABLE(product_tv, AC_HELP_STRING([--enable-product-tv], [using tv product features]),
 [
    case "${enableval}" in

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index e3f6255..e83ff41 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -17,7 +17,6 @@ Requires(post): /usr/bin/buxton2ctl
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(deviced)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(db-util)
@@ -29,6 +28,7 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-session)
 BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(capi-system-device)
 BuildRequires:  gettext-tools
 
 %if "%{tizen_profile_name}" == "tv"

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index 7407f90..d97d6d5 100755 (executable)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -29,7 +29,7 @@
 #include <sys/prctl.h>
 #endif
 #include <system_info.h>
-#include <dd-display.h>
+#include <device/power.h>
 
 #ifndef _USE_DEVICED_DBUS
 #include <usb-device.h>
@@ -409,12 +409,12 @@ int ms_set_power_mode(ms_db_status_type_t status)
 
        switch (status) {
        case MS_DB_UPDATING:
-               err = display_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
+               err = device_power_request_lock(POWER_LOCK_CPU, 0);
                if (err != 0)
                        res = MS_MEDIA_ERR_INTERNAL;
                break;
        case MS_DB_UPDATED:
-               err = display_unlock_state(LCD_OFF, PM_RESET_TIMER);
+               err = device_power_release_lock(POWER_LOCK_CPU);
                if (err != 0)
                        res = MS_MEDIA_ERR_INTERNAL;
                break;