From 4be15e8ac6f0810c94a8b8aca6e78742f0137769 Mon Sep 17 00:00:00 2001 From: "joonbum.ko" Date: Fri, 21 Apr 2017 16:56:34 +0900 Subject: [PATCH] tpl_wayland_egl_thread: Changed the name of APIs. Change-Id: I86b11375d12e8531fd3d3ecef0c3396d19e62c20 Signed-off-by: joonbum.ko --- src/tpl_wayland_egl_thread.c | 25 ++++++++++++------------- src/tpl_wayland_egl_thread.h | 15 +++++++-------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c index 37ec5b2..3bd07c5 100644 --- a/src/tpl_wayland_egl_thread.c +++ b/src/tpl_wayland_egl_thread.c @@ -319,8 +319,7 @@ _twe_thread_fini_wl_tbm_client(struct wayland_tbm_client *wl_tbm_client) twe_display_h -twe_thread_add_wl_display(twe_thread* thread, - struct wl_display *display) +twe_display_add(twe_thread* thread, struct wl_display *display) { twe_thread_context *ctx = thread->ctx; twe_wl_disp_source *source; @@ -361,7 +360,7 @@ twe_thread_add_wl_display(twe_thread* thread, } tpl_result_t -twe_thread_del_wl_display(twe_display_h twe_display) +twe_display_del(twe_display_h twe_display) { gboolean is_destroyed = FALSE; twe_thread *thread = NULL; @@ -434,7 +433,7 @@ static GSourceFuncs _twe_wl_surface_funcs = { }; tbm_surface_queue_h -twe_thread_get_tbm_queue(twe_surface_h twe_surface) +twe_surface_get_tbm_queue(twe_surface_h twe_surface) { /* TODO */ return NULL; @@ -442,9 +441,9 @@ twe_thread_get_tbm_queue(twe_surface_h twe_surface) twe_surface_h -twe_thread_add_wl_surface(twe_thread* thread, - twe_display_h twe_display, - struct wl_surface *surface) +twe_surface_add(twe_thread* thread, + twe_display_h twe_display, + struct wl_surface *surface) { twe_thread_context *ctx = thread->ctx; twe_wl_surf_source *source = NULL; @@ -493,7 +492,7 @@ twe_thread_add_wl_surface(twe_thread* thread, } tpl_result_t -twe_thread_del_wl_surface(twe_surface_h twe_surface) +twe_surface_del(twe_surface_h twe_surface) { twe_wl_surf_source *surf_source = (twe_wl_surf_source *)twe_surface; twe_wl_disp_source *disp_source = NULL; @@ -556,7 +555,7 @@ timeout_cb(gpointer data) } static GSource* -_twe_thread_test_add_timeout(twe_thread *thread, struct wl_display *display) +_twe_test_add_timeout(twe_thread *thread, struct wl_display *display) { GSource *timeout; timeout = g_timeout_source_new(1000); @@ -568,7 +567,7 @@ _twe_thread_test_add_timeout(twe_thread *thread, struct wl_display *display) } static void -_twe_thread_test_del_timeout(GSource *timeout) +_twe_test_del_timeout(GSource *timeout) { g_source_destroy(timeout); g_source_unref(timeout); @@ -600,7 +599,7 @@ main(void) registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - twe_display = twe_thread_add_wl_display(t_thread, display); + twe_display = twe_display_add(t_thread, display); while (1) { sleep(1); @@ -608,12 +607,12 @@ main(void) if (count == 3) { TPL_DEBUG("#### PRE_DEL"); - twe_thread_del_wl_display(twe_display); + twe_display_del(twe_display); TPL_DEBUG("#### DEL"); } } - _twe_thread_test_del_timeout(timeout); + _twe_test_del_timeout(timeout); twe_thread_destroy(t_thread); } diff --git a/src/tpl_wayland_egl_thread.h b/src/tpl_wayland_egl_thread.h index f07d10f..61788e9 100644 --- a/src/tpl_wayland_egl_thread.h +++ b/src/tpl_wayland_egl_thread.h @@ -16,20 +16,19 @@ void twe_thread_destroy(twe_thread* thread); twe_display_h -twe_thread_add_wl_display(twe_thread* thread, - struct wl_display *display); +twe_display_add(twe_thread* thread, struct wl_display *display); tpl_result_t -twe_thread_del_wl_display(twe_display_h display); +twe_display_del(twe_display_h display); twe_surface_h -twe_thread_add_wl_surface(twe_thread* thread, - twe_display_h twe_display, - struct wl_surface *surface); +twe_surface_add(twe_thread* thread, + twe_display_h twe_display, + struct wl_surface *surface); tpl_result_t -twe_thread_del_wl_surface(twe_surface_h twe_surface); +twe_surface_del(twe_surface_h twe_surface); tbm_surface_queue_h -twe_thread_get_tbm_queue(twe_surface_h twe_surface); +twe_surface_get_tbm_queue(twe_surface_h twe_surface); -- 2.7.4