power: replace pmapi to libdeviced to lock power state

- pmapi is not supported anymore and libdeviced supports
  the same operation. Thus the apis are replaced and
  the dependency for deviced is added

Change-Id: I44700d25f464b16b124d8bb36accf6f0736122b6
Signed-off-by: Taeyoung Kim <ty317.kim@samsung.com>

diff --git a/configure.ac b/configure.ac
index 5354794..46b55e5 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ PKG_CHECK_MODULES(AUL, aul)
 AC_SUBST(AUL_CFLAGS)
 AC_SUBST(AUL_LIBS)
 
-PKG_CHECK_MODULES(LIBPMCONTROL, pmapi)
+PKG_CHECK_MODULES(LIBPMCONTROL, deviced)
 AC_SUBST(LIBPMCONTROL_CFLAGS)
 AC_SUBST(LIBPMCONTROL_LIBS)
 

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index d24150c..6b21980 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -16,7 +16,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(pmapi)
+BuildRequires:  pkgconfig(deviced)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(db-util)

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 8e872d1..c83d3ea 100755 (executable)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -31,7 +31,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <malloc.h>
-#include <pmapi.h>
 #include <vconf.h>
 
 #include "media-util.h"

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 6c5f7a6..501564f 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -33,7 +33,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <malloc.h>
-#include <pmapi.h>
+#include <dd-display.h>
 #include <vconf.h>
 
 #include "media-util.h"
@@ -173,12 +173,12 @@ static int __msc_set_power_mode(ms_db_status_type_t status)
 
        switch (status) {
        case MS_DB_UPDATING:
-               err = pm_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
+               err = display_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
                if (err != 0)
                        res = MS_MEDIA_ERR_INTERNAL;
                break;
        case MS_DB_UPDATED:
-               err = pm_unlock_state(LCD_OFF, STAY_CUR_STATE);
+               err = display_unlock_state(LCD_OFF, PM_RESET_TIMER);
                if (err != 0)
                        res = MS_MEDIA_ERR_INTERNAL;
                break;

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index 4823204..5a1e424 100755 (executable)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <pmapi.h>
+#include <dd-display.h>
 
 #include "media-common-utils.h"
 #include "media-common-external-storage.h"
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
 
        msc_get_power_status(&power_off_status);
        if (power_off_status) {
-               pm_unlock_state(LCD_OFF, STAY_CUR_STATE);
+               display_unlock_state(LCD_OFF, PM_RESET_TIMER);
        }
 
        msc_deinit_extract_thread();

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index e86aaa5..06c72fc 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -24,7 +24,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <malloc.h>
-#include <pmapi.h>
+#include <dd-display.h>
 #include <vconf.h>
 #include <grp.h>
 #include <pwd.h>
@@ -129,12 +129,12 @@ static int __msc_set_power_mode(ms_db_status_type_t status)
 
        switch (status) {
        case MS_DB_UPDATING:
-               err = pm_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
+               err = display_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
                if (err != 0)
                        res = MS_MEDIA_ERR_INTERNAL;
                break;
        case MS_DB_UPDATED:
-               err = pm_unlock_state(LCD_OFF, STAY_CUR_STATE);
+               err = display_unlock_state(LCD_OFF, PM_RESET_TIMER);
                if (err != 0)
                        res = MS_MEDIA_ERR_INTERNAL;
                break;