video: Move duplicated code, find_video_child_get() to e_video_hwc.

Change-Id: Ifbb5980ca937acec0456669ac423a0aa3830d4ba

diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c
index 45b1bf6..0d8ab94 100644 (file)
--- a/src/bin/video/iface/e_video_hwc.c
+++ b/src/bin/video/iface/e_video_hwc.c
@@ -19,6 +19,28 @@ struct _E_Video_Hwc
    E_Video_Comp_Iface *backend;
 };
 
+EINTERN E_Client *
+e_video_hwc_child_client_get(E_Client *ec)
+{
+   E_Client *subc = NULL;
+   Eina_List *l;
+   if (!ec) return NULL;
+   if (e_object_is_del(E_OBJECT(ec))) return NULL;
+   if (!ec->comp_data) return NULL;
+
+   if (ec->comp_data->video_client) return ec;
+
+   EINA_LIST_FOREACH(ec->comp_data->sub.below_list, l, subc)
+     {
+        E_Client *temp= NULL;
+        if (!subc->comp_data || e_object_is_del(E_OBJECT(subc))) continue;
+        temp = e_video_hwc_child_client_get(subc);
+        if(temp) return temp;
+     }
+
+   return NULL;
+}
+
 static tbm_surface_h
 _e_video_hwc_client_tbm_surface_get(E_Client *ec)
 {

diff --git a/src/bin/video/iface/e_video_hwc.h b/src/bin/video/iface/e_video_hwc.h
index c550aee..480f356 100644 (file)
--- a/src/bin/video/iface/e_video_hwc.h
+++ b/src/bin/video/iface/e_video_hwc.h
@@ -30,7 +30,8 @@ struct _E_Video_Hwc_Geometry
 EINTERN E_Video_Comp_Iface  *e_video_hwc_planes_iface_create(E_Client *ec);
 EINTERN E_Video_Comp_Iface  *e_video_hwc_windows_iface_create(E_Client *ec);
 
-EINTERN Eina_Bool e_video_hwc_geometry_get(E_Client *ec, E_Video_Hwc_Geometry *out);
-EINTERN Eina_Bool e_video_hwc_geometry_map_apply(E_Client *ec, E_Video_Hwc_Geometry *out);
+EINTERN E_Client    *e_video_hwc_child_client_get(E_Client *ec);
+EINTERN Eina_Bool    e_video_hwc_geometry_get(E_Client *ec, E_Video_Hwc_Geometry *out);
+EINTERN Eina_Bool    e_video_hwc_geometry_map_apply(E_Client *ec, E_Video_Hwc_Geometry *out);
 
 #endif

diff --git a/src/bin/video/iface/e_video_hwc_planes.c b/src/bin/video/iface/e_video_hwc_planes.c
index f0f181f..1e63f49 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_planes.c
+++ b/src/bin/video/iface/e_video_hwc_planes.c
@@ -104,28 +104,6 @@ static void _e_video_vblank_handler(tdm_output *output, unsigned int sequence, u
 
 
 static E_Client *
-find_video_child_get(E_Client *ec)
-{
-   E_Client *subc = NULL;
-   Eina_List *l;
-   if (!ec) return NULL;
-   if (e_object_is_del(E_OBJECT(ec))) return NULL;
-   if (!ec->comp_data) return NULL;
-
-   if (ec->comp_data->video_client) return ec;
-
-   EINA_LIST_FOREACH(ec->comp_data->sub.below_list, l, subc)
-     {
-        E_Client *temp= NULL;
-        if (!subc->comp_data || e_object_is_del(E_OBJECT(subc))) continue;
-        temp = find_video_child_get(subc);
-        if(temp) return temp;
-     }
-
-   return NULL;
-}
-
-static E_Client *
 find_offscreen_parent_get(E_Client *ec)
 {
    E_Client *parent = NULL;
@@ -1657,7 +1635,7 @@ _e_video_cb_ec_client_show(void *data, int type, void *event)
    ec = ev->ec;
    if (!ec->comp_data) return ECORE_CALLBACK_PASS_ON;
 
-   video_ec = find_video_child_get(ec);
+   video_ec = e_video_hwc_child_client_get(ec);
    if (!video_ec) return ECORE_CALLBACK_PASS_ON;
 
    evhp = data;

diff --git a/src/bin/video/iface/e_video_hwc_windows.c b/src/bin/video/iface/e_video_hwc_windows.c
index fef5ed8..973d57a 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_windows.c
+++ b/src/bin/video/iface/e_video_hwc_windows.c
@@ -75,28 +75,6 @@ static Eina_Bool _e_video_frame_buffer_show(E_Video_Hwc_Windows *evhw, E_Comp_Wl
 static void      _e_video_vblank_handler(tdm_output *output, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, void *user_data);
 
 static E_Client *
-find_video_child_get(E_Client *ec)
-{
-   E_Client *subc = NULL;
-   Eina_List *l;
-   if (!ec) return NULL;
-   if (e_object_is_del(E_OBJECT(ec))) return NULL;
-   if (!ec->comp_data) return NULL;
-
-   if (ec->comp_data->video_client) return ec;
-
-   EINA_LIST_FOREACH(ec->comp_data->sub.below_list, l, subc)
-     {
-        E_Client *temp= NULL;
-        if (!subc->comp_data || e_object_is_del(E_OBJECT(subc))) continue;
-        temp = find_video_child_get(subc);
-        if(temp) return temp;
-     }
-
-   return NULL;
-}
-
-static E_Client *
 find_offscreen_parent_get(E_Client *ec)
 {
    E_Client *parent = NULL;
@@ -1182,7 +1160,7 @@ _e_video_cb_ec_client_show(void *data, int type, void *event)
    ec = ev->ec;
    if (!ec->comp_data) return ECORE_CALLBACK_PASS_ON;
 
-   video_ec = find_video_child_get(ec);
+   video_ec = e_video_hwc_child_client_get(ec);
    if (!video_ec) return ECORE_CALLBACK_PASS_ON;
 
    evhw = data;