replace service_ with app_control_

Change-Id: I2fe52b41c1d16d8a5479d64f55182dcfa13c2400

diff --git a/live.viewer/src/main.c b/live.viewer/src/main.c
index 9f84418..1f57b90 100644 (file)
--- a/live.viewer/src/main.c
+++ b/live.viewer/src/main.c
@@ -163,7 +163,7 @@ static void app_resume(void *data)
        DbgPrint("resume");
 }
 
-static void app_reset(service_h service, void *data)
+static void app_control(app_control_h service, void *data)
 {
        DbgPrint("reset");
 }
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
        event_callback.terminate = app_terminate;
        event_callback.pause = app_pause;
        event_callback.resume = app_resume;
-       event_callback.service = app_reset;
+       event_callback.app_control = app_control;
        event_callback.low_memory = NULL;
        event_callback.low_battery = NULL;
        event_callback.device_orientation = NULL;

diff --git a/src/livebox.c b/src/livebox.c
index 4567c02..50bfbdd 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -120,15 +120,15 @@ static int default_launch_handler(struct livebox *handler, const char *appid, vo
        }
 
 /*
-       service_h service;
+       app_control_h service;
 
        DbgPrint("AUTO_LAUNCH [%s]\n", handler->common->lb.auto_launch);
 
-       ret = service_create(&service);
-       if (ret == SERVICE_ERROR_NONE) {
-               service_set_package(service, handler->common->lb.auto_launch);
-               service_send_launch_request(service, NULL, NULL);
-               service_destroy(service);
+       ret = app_control_create(&service);
+       if (ret == APP_CONTROL_ERROR_NONE) {
+               app_control_set_package(service, handler->common->lb.auto_launch);
+               app_control_send_launch_request(service, NULL, NULL);
+               app_control_destroy(service);
        } else {
                ErrPrint("Failed to launch an app %s (%d)\n", handler->common->lb.auto_launch, ret);
        }