diff options
| -rwxr-xr-x | src/app_main.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/app_main.c b/src/app_main.c index a3fbdda..2e206a1 100755 --- a/src/app_main.c +++ b/src/app_main.c @@ -23,7 +23,7 @@ #include <fcntl.h> #include <bundle.h> -#include <appcore_ui_base.h> +#include <appcore_efl_base.h> #include <dlog.h> #include <app_internal.h> @@ -77,7 +77,7 @@ static int __app_event_converter[APPCORE_BASE_EVENT_MAX] = { static int __ui_app_create(void *data) { - appcore_ui_base_on_create(); + appcore_efl_base_on_create(); if (__context.callback.create == NULL || __context.callback.create(__context.data) == false) return app_error(APP_ERROR_INVALID_CONTEXT, __FUNCTION__, "app_create_cb() returns false"); @@ -87,7 +87,7 @@ static int __ui_app_create(void *data) static int __ui_app_terminate(void *data) { - appcore_ui_base_on_terminate(); + appcore_efl_base_on_terminate(); if (__context.callback.terminate) __context.callback.terminate(__context.data); @@ -99,7 +99,7 @@ static int __ui_app_control(bundle *b, void *data) { app_control_h app_control = NULL; - appcore_ui_base_on_control(b); + appcore_efl_base_on_control(b); if (b) { if (app_control_create_event(b, &app_control) != APP_ERROR_NONE) @@ -119,7 +119,7 @@ static int __ui_app_control(bundle *b, void *data) static int __ui_app_pause(void *data) { - appcore_ui_base_on_pause(); + appcore_efl_base_on_pause(); if (__context.callback.pause) __context.callback.pause(__context.data); return APP_ERROR_NONE; @@ -127,13 +127,13 @@ static int __ui_app_pause(void *data) static int __ui_app_resume(void *data) { - appcore_ui_base_on_resume(); + appcore_efl_base_on_resume(); if (__context.callback.resume) __context.callback.resume(__context.data); return APP_ERROR_NONE; } -static int __app_init(int argc, char **argv, ui_app_lifecycle_callback_s *callback, void *user_data, appcore_ui_base_ops ops) +static int __app_init(int argc, char **argv, ui_app_lifecycle_callback_s *callback, void *user_data, appcore_efl_base_ops ops) { int ret; @@ -150,12 +150,12 @@ static int __app_init(int argc, char **argv, ui_app_lifecycle_callback_s *callba __context.data = user_data; __app_state = APP_STATE_CREATING; - ret = appcore_ui_base_init(ops, argc, argv, NULL, - APPCORE_UI_BASE_HINT_WINDOW_GROUP_CONTROL | - APPCORE_UI_BASE_HINT_WINDOW_STACK_CONTROL | - APPCORE_UI_BASE_HINT_BG_LAUNCH_CONTROL | - APPCORE_UI_BASE_HINT_HW_ACC_CONTROL | - APPCORE_UI_BASE_HINT_WINDOW_AUTO_CONTROL); + ret = appcore_efl_base_init(ops, argc, argv, NULL, + APPCORE_EFL_BASE_HINT_WINDOW_GROUP_CONTROL | + APPCORE_EFL_BASE_HINT_WINDOW_STACK_CONTROL | + APPCORE_EFL_BASE_HINT_BG_LAUNCH_CONTROL | + APPCORE_EFL_BASE_HINT_HW_ACC_CONTROL | + APPCORE_EFL_BASE_HINT_WINDOW_AUTO_CONTROL); if (ret < 0) { __app_state = APP_STATE_NOT_RUNNING; @@ -167,23 +167,23 @@ static int __app_init(int argc, char **argv, ui_app_lifecycle_callback_s *callba static void __app_fini(void) { - appcore_ui_base_fini(); + appcore_efl_base_fini(); __app_state = APP_STATE_NOT_RUNNING; } int ui_app_init(int argc, char **argv, ui_app_lifecycle_callback_s *callback, void *user_data, appcore_context_h *handle) { - appcore_ui_base_ops ops = appcore_ui_base_get_default_ops(); + appcore_efl_base_ops ops = appcore_efl_base_get_default_ops(); /* override methods */ - ops.base.create = __ui_app_create; - ops.base.control = __ui_app_control; - ops.base.terminate = __ui_app_terminate; - ops.pause = __ui_app_pause; - ops.resume = __ui_app_resume; - ops.base.run = NULL; - ops.base.exit = NULL; + ops.ui_base.base.create = __ui_app_create; + ops.ui_base.base.control = __ui_app_control; + ops.ui_base.base.terminate = __ui_app_terminate; + ops.ui_base.pause = __ui_app_pause; + ops.ui_base.resume = __ui_app_resume; + ops.ui_base.base.run = NULL; + ops.ui_base.base.exit = NULL; return __app_init(argc, argv, callback, user_data, ops); } @@ -196,14 +196,14 @@ void ui_app_fini(appcore_context_h handle) int ui_app_main(int argc, char **argv, ui_app_lifecycle_callback_s *callback, void *user_data) { int ret; - appcore_ui_base_ops ops = appcore_ui_base_get_default_ops(); + appcore_efl_base_ops ops = appcore_efl_base_get_default_ops(); /* override methods */ - ops.base.create = __ui_app_create; - ops.base.control = __ui_app_control; - ops.base.terminate = __ui_app_terminate; - ops.pause = __ui_app_pause; - ops.resume = __ui_app_resume; + ops.ui_base.base.create = __ui_app_create; + ops.ui_base.base.control = __ui_app_control; + ops.ui_base.base.terminate = __ui_app_terminate; + ops.ui_base.pause = __ui_app_pause; + ops.ui_base.resume = __ui_app_resume; ret = __app_init(argc, argv, callback, user_data, ops); if (ret != APP_ERROR_NONE) @@ -216,7 +216,7 @@ int ui_app_main(int argc, char **argv, ui_app_lifecycle_callback_s *callback, vo void ui_app_exit(void) { - appcore_ui_base_exit(); + appcore_efl_base_exit(); } int __event_cb(void *event, void *data) |