[Release] livebox.web-provider-1.36

[platform/framework/web/web-provider.git] / src / Daemon / main.cpp

diff --git a/src/Daemon/main.cpp b/src/Daemon/main.cpp
index 269e2bd..7cc2f75 100755 (executable)
--- a/src/Daemon/main.cpp
+++ b/src/Daemon/main.cpp
@@ -18,74 +18,66 @@
  * @author  Yunchan Cho (yunchan.cho@samsung.com)
  */
 #include <aul.h>
-#include <bundle.h>
-#include <appcore-efl.h>
+#include <app.h>
 #include <Elementary.h>
 #include <Core/Util/Log.h>
 #include "BoxDaemon.h"
 
-static int app_create(void *data)
+static bool app_create(void *data)
 {
     LogD("app create");
-       elm_config_preferred_engine_set("opengl_x11");
-    return 0;
+    elm_config_preferred_engine_set("opengl_x11");
+    return true;
 }
 
-static int app_reset(bundle *b, void *data)
+static void app_reset(service_h service, void *data)
 {
-    bool ret;
-    const char *name;
-
     LogD("app reset");
 
-    name = bundle_get_val(b, "name");
-    if (!name) {
-        LogD("slave name is NULL");
-        return -EINVAL;
-    }
+    int ret;
+    char* name;
 
     BoxDaemon *daemon = static_cast<BoxDaemon*>(data);
-    std::string daemonName(name);
-    ret = daemon->start(daemonName);
-    if (!ret) {
-        LogD("livebox daemon failed to start");
-           aul_terminate_pid(getpid());
+    ret = service_get_extra_data(service, "name", &name);
+    if (ret == SERVICE_ERROR_NONE) {
+        std::string daemonName(name);
+        if(!(daemon->start(daemonName))) {
+            LogD("daemon failed to start");
+            aul_terminate_pid(getpid());
+        }
+        return;
     }
 
-    return static_cast<int>(ret);
+    daemon->handleAppService(service);
 }
 
-static int app_pause(void *data)
+static void app_pause(void *data)
 {
-    return 0;
 }
 
-static int app_resume(void *data)
+static void app_resume(void *data)
 {
-    return 0;
 }
 
-static int app_terminate(void *data)
+static void app_terminate(void *data)
 {
     BoxDaemon *daemon = static_cast<BoxDaemon *>(data);
     daemon->stop();
-
-    return 0;
 }
 
 int main (int argc, char *argv[])
 {
     int ret;
 
-       struct appcore_ops ops;
+    app_event_callback_s ops;
+    memset(&ops, 0x00, sizeof(app_event_callback_s));
     BoxDaemon daemon;
 
     ops.create = app_create;
     ops.terminate = app_terminate;
     ops.pause = app_pause;
     ops.resume = app_resume;
-    ops.reset = app_reset;
-    ops.data = &daemon;
+    ops.service = app_reset;
 
 #if !defined(TIZEN_PUBLIC)
     setenv("COREGL_FASTPATH", "1", 1);
@@ -94,6 +86,6 @@ int main (int argc, char *argv[])
     setenv("CAIRO_GL_LAZY_FLUSHING", "yes", 1);
     setenv("ELM_IMAGE_CACHE", "0", 1);
 
-    ret = appcore_efl_main("web-provider", &argc, &argv, &ops);
+    ret = app_efl_main(&argc, &argv, &ops, &daemon);
     return ret;
 }