pmapi: package & functions are changed to "deviced"

Change-Id: I6f9e2cfaeb59ab63765a86ce8c022ba05313d5d3
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4730ffd3db72820862f8ad9f892b6af3fc640b48..1a833007f127e8961877ffb8a6eb6af6e520d0d6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,6 @@ add_definitions(-Iinclude)
 ADD_EXECUTABLE(${PROJECT_NAME} src/emuld.cpp src/evdi.cpp src/emuld_proc.cpp src/client.cpp src/get_status.cpp src/log.cpp)
 
 target_link_libraries(${PROJECT_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} "-lpthread -lvconf -lpmapi" )
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} "-lpthread -lvconf -ldeviced" )
 
 install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)

diff --git a/packaging/emuld.spec b/packaging/emuld.spec
index 3f4c5a5200d87ceff59a41cb846d43f0d7113898..c61ff392de7a87316713278b1e2ca80d8d35f984 100644 (file)
--- a/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@ -1,5 +1,5 @@
 Name: emuld
-Version: 0.4.2
+Version: 0.4.3
 Release: 0
 Summary: Emulator daemon
 License: Apache-2.0
@@ -8,7 +8,7 @@ Group: SDK/Other
 Source1001: packaging/emuld.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(pmapi)
+BuildRequires: pkgconfig(deviced)
 
 %description
 A emulator daemon is used for communication emulator between and ide.

diff --git a/src/emuld.cpp b/src/emuld.cpp
index 142c8e696de3aaaf3798a89142e9779fb657fd56..0bcb6341318bc97f7be4bd974a150f907c7226d3 100644 (file)
--- a/src/emuld.cpp
+++ b/src/emuld.cpp
@@ -30,7 +30,7 @@
 #include "emuld_common.h"
 #include "emuld.h"
 #include "synbuf.h"
-#include "pmapi.h"
+#include "deviced/dd-display.h"
 
 #define PMAPI_RETRY_COUNT       3
 #define MAX_CONNECT_TRY_COUNT   (60 * 3)
@@ -943,8 +943,8 @@ void set_lock_state() {
     int ret = 0;
     // Now we blocking to enter "SLEEP".
     while(i < PMAPI_RETRY_COUNT ) {
-        ret = pm_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
-        LOG("pm_lock_state() return: %d", ret);
+        ret = display_lock_state(LCD_OFF, STAY_CUR_STATE, 0);
+        LOG("display_lock_state() return: %d", ret);
         if(ret == 0)
         {
             break;
@@ -953,7 +953,7 @@ void set_lock_state() {
         sleep(10);
     }
     if (i == PMAPI_RETRY_COUNT) {
-        LOG("Emulator Daemon: Failed to call pm_lock_state().\n");
+        LOG("Emulator Daemon: Failed to call display_lock_state().\n");
     }
 }