From 94053e84cc88dfb1b3bc01365605f0f05703d08c Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 29 Jan 2020 14:40:42 +0900 Subject: [PATCH] Remove Ecore-Wl2 dependency The parameter type of frame_broker_create() is changed to void pointer. Change-Id: I70dd358c3bed7e830ff63b468bfe93ec169d4333 Signed-off-by: Hwankyu Jhun --- frame-broker/frame-broker.pc.in | 2 +- frame-broker/include/frame_broker.h | 3 +-- frame-broker/src/frame_broker.c | 6 ++++-- frame-provider/frame-provider.pc.in | 2 +- frame-provider/include/frame_provider.h | 3 +-- frame-provider/src/frame_provider.c | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frame-broker/frame-broker.pc.in b/frame-broker/frame-broker.pc.in index f198881..12d08f0 100644 --- a/frame-broker/frame-broker.pc.in +++ b/frame-broker/frame-broker.pc.in @@ -6,7 +6,7 @@ includedir=@INCLUDEDIR@ Name: launcher-service Description: Support development of the launcher Version: @VERSION@ -Requires: screen_connector_launcher_service ecore-wl2 capi-appfw-app-control +Requires: screen_connector_launcher_service capi-appfw-app-control Libs: -L${libdir} -lframe-broker Cflags: -I${includedir} cppflags: -I${includedir} diff --git a/frame-broker/include/frame_broker.h b/frame-broker/include/frame_broker.h index 217fede..c0a8a6b 100644 --- a/frame-broker/include/frame_broker.h +++ b/frame-broker/include/frame_broker.h @@ -17,7 +17,6 @@ #ifndef __FRAME_BROKER_H__ #define __FRAME_BROKER_H__ -#include #include #include #include @@ -55,7 +54,7 @@ typedef struct frame_broker_s *frame_broker_h; * * @see frame_broker_destroy() */ -int frame_broker_create(Ecore_Wl2_Window *wl2_win, +int frame_broker_create(void *wl2_win, frame_context_lifecycle_callback_s *callback, void *user_data, frame_broker_h *handle); diff --git a/frame-broker/src/frame_broker.c b/frame-broker/src/frame_broker.c index 5159600..12b0de6 100644 --- a/frame-broker/src/frame_broker.c +++ b/frame-broker/src/frame_broker.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "frame_broker.h" #include "frame_broker_private.h" @@ -276,7 +277,7 @@ static void __scls_reset_cb(uint32_t serial, void *user_data) frame_context_set_frame(context, NULL); } -API int frame_broker_create(Ecore_Wl2_Window *wl2_win, +API int frame_broker_create(void *wl2_win, frame_context_lifecycle_callback_s *callback, void *user_data, frame_broker_h *handle) @@ -338,7 +339,8 @@ API int frame_broker_create(Ecore_Wl2_Window *wl2_win, return FRAME_BROKER_ERROR_IO_ERROR; } - ret = screen_connector_launcher_service_create(wl2_win, &scls); + ret = screen_connector_launcher_service_create( + (Ecore_Wl2_Window *)wl2_win, &scls); if (ret != 0) { _E("Failed to create scls evas. error(%d)", ret); frame_broker_destroy(broker); diff --git a/frame-provider/frame-provider.pc.in b/frame-provider/frame-provider.pc.in index c39c6f4..7a1ac5f 100644 --- a/frame-provider/frame-provider.pc.in +++ b/frame-provider/frame-provider.pc.in @@ -6,7 +6,7 @@ includedir=@INCLUDEDIR@ Name: frame-provider Description: Support development of the frame provider Version: @VERSION@ -Requires: screen_connector_shared_widget_launch elementary bundle +Requires: screen_connector_shared_widget_launch bundle Libs: -L${libdir} -lframe-provider Cflags: -I${includedir} cppflags: -I${includedir} diff --git a/frame-provider/include/frame_provider.h b/frame-provider/include/frame_provider.h index cb72068..e34e6ba 100644 --- a/frame-provider/include/frame_provider.h +++ b/frame-provider/include/frame_provider.h @@ -19,7 +19,6 @@ #include -#include #include #include @@ -97,7 +96,7 @@ typedef struct { * @see frame_provider_destroy() * @see frame_provider_event_callback_s */ -int frame_provider_create(Ecore_Wl2_Window *wl2_win, +int frame_provider_create(void *wl2_win, frame_provider_event_callback_s *callback, void *user_data, frame_provider_h *handle); diff --git a/frame-provider/src/frame_provider.c b/frame-provider/src/frame_provider.c index f2e60b5..76cfa43 100644 --- a/frame-provider/src/frame_provider.c +++ b/frame-provider/src/frame_provider.c @@ -83,7 +83,7 @@ static void __scswl_prepare_cb( provider->callback.hide(provider, provider->user_data); } -API int frame_provider_create(Ecore_Wl2_Window *wl2_win, +API int frame_provider_create(void *wl2_win, frame_provider_event_callback_s *callback, void *user_data, frame_provider_h *handle) @@ -107,8 +107,8 @@ API int frame_provider_create(Ecore_Wl2_Window *wl2_win, return FRAME_PROVIDER_ERROR_OUT_OF_MEMORY; } - ret = screen_connector_shared_widget_launch_create(wl2_win, - &provider->scswl); + ret = screen_connector_shared_widget_launch_create( + (Ecore_Wl2_Window *)wl2_win, &provider->scswl); if (ret != 0) { _E("Failed to create scswl. error(%d)", ret); frame_provider_destroy(provider); -- 2.7.4