From: Jeongmo Yang Date: Tue, 2 Jan 2018 06:49:21 +0000 (+0900) Subject: Optimize get parent id funtion X-Git-Tag: submit/tizen/20180103.062513^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5111aa6cb29e9673eb3436df4855b0fa98e04adb;p=platform%2Fcore%2Fmultimedia%2Flibmm-display.git Optimize get parent id funtion [Version] 0.0.2 [Profile] Common [Issue Type] Update [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20171229.1] Change-Id: I36949af477d92d89f3e41c9f1dfb01a5887e1f67 Signed-off-by: Jeongmo Yang --- diff --git a/packaging/libmm-display.spec b/packaging/libmm-display.spec index 824216c..32e6263 100644 --- a/packaging/libmm-display.spec +++ b/packaging/libmm-display.spec @@ -1,6 +1,6 @@ Name: libmm-display Summary: Multimedia framework display library -Version: 0.0.2 +Version: 0.0.3 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_display.c b/src/mm_display.c index 698de48..0ea6278 100644 --- a/src/mm_display.c +++ b/src/mm_display.c @@ -115,10 +115,8 @@ int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id) int ret = MM_ERROR_NONE; Ecore_Wl_Window *window = NULL; struct wl_display *display = NULL; - struct wl_display *display_wrapper = NULL; struct wl_surface *surface = NULL; struct wl_registry *registry = NULL; - struct wl_event_queue *queue = NULL; struct tizen_surface *tz_surface = NULL; struct tizen_resource *tz_resource = NULL; @@ -150,23 +148,7 @@ int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id) goto _DONE; } - display_wrapper = wl_proxy_create_wrapper(display); - if (!display_wrapper) { - LOGE("failed to create wl display wrapper"); - ret = MM_ERROR_UNKNOWN; - goto _DONE; - } - - queue = wl_display_create_queue(display); - if (!queue) { - LOGE("failed to create wl display queue"); - ret = MM_ERROR_UNKNOWN; - goto _DONE; - } - - wl_proxy_set_queue((struct wl_proxy *)display_wrapper, queue); - - registry = wl_display_get_registry(display_wrapper); + registry = wl_display_get_registry(display); if (!registry) { LOGE("failed to get wayland registry"); ret = MM_ERROR_UNKNOWN; @@ -175,8 +157,8 @@ int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id) wl_registry_add_listener(registry, &_mm_display_wl_registry_listener, &tz_surface); - wl_display_dispatch_queue(display, queue); - wl_display_roundtrip_queue(display, queue); + wl_display_dispatch(display); + wl_display_roundtrip(display); if (!tz_surface) { LOGE("failed to get tizen surface"); @@ -184,7 +166,7 @@ int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id) goto _DONE; } - /* Get parent_id which is unique in a entire systemw. */ + /* Get parent_id which is unique in a entire system. */ tz_resource = tizen_surface_get_tizen_resource(tz_surface, surface); if (!tz_resource) { LOGE("failed to get tizen resurce"); @@ -196,7 +178,7 @@ int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id) tizen_resource_add_listener(tz_resource, &_mm_display_tz_resource_listener, parent_id); - wl_display_roundtrip_queue(display, queue); + wl_display_roundtrip(display); if (*parent_id > 0) { ret = MM_ERROR_NONE; @@ -222,16 +204,6 @@ _DONE: registry = NULL; } - if (queue) { - wl_event_queue_destroy(queue); - queue = NULL; - } - - if (display_wrapper) { - wl_proxy_wrapper_destroy(display_wrapper); - display_wrapper = NULL; - } - return ret; }