e_plane_renderer: use e_client_cdata_get

Change-Id: Ia94b11726d63b0ccfe49f279f2a7c45d134080b9

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index 06256522e859731ba3cd78c6077e620fe05ce5fd..27313bfa4cba173c173448063e8a9d3e51accffb 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -65,11 +65,11 @@ static int render_buffers_key;
 static E_Comp_Wl_Buffer *
 _get_comp_wl_buffer(E_Client *ec)
 {
-   E_Comp_Wl_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
 
    if (!ec) return NULL;
 
-   cdata = (E_Comp_Wl_Client_Data*)ec->comp_data;
+   cdata = e_client_cdata_get(ec);
    if (!cdata) return NULL;
 
    E_Comp_Wl_Buffer_Ref *buffer_ref = &cdata->buffer_ref;
@@ -80,11 +80,11 @@ _get_comp_wl_buffer(E_Client *ec)
 static struct wl_resource *
 _get_wl_buffer(E_Client *ec)
 {
-   E_Comp_Wl_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
 
    if (!ec) return NULL;
 
-   cdata = (E_Comp_Wl_Client_Data*)ec->comp_data;
+   cdata = e_client_cdata_get(ec);
    if (!cdata) return NULL;
 
    E_Comp_Wl_Buffer_Ref *buffer_ref = &cdata->buffer_ref;
@@ -220,11 +220,11 @@ _e_plane_renderer_wayland_tbm_client_queue_get(E_Client *ec)
    struct wayland_tbm_client_queue * cqueue = NULL;
    struct wl_resource *wl_surface = NULL;
    E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data;
-   E_Comp_Wl_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(wl_cdata, NULL);
 
-   cdata = (E_Comp_Wl_Client_Data *)e_pixmap_cdata_get(ec->pixmap);
+   cdata = e_pixmap_cdata_get(ec->pixmap);
    EINA_SAFETY_ON_NULL_RETURN_VAL(cdata, NULL);
 
    wl_surface = cdata->wl_surface;
@@ -988,7 +988,7 @@ _e_plane_renderer_recover_ec(E_Plane_Renderer *renderer)
 {
    E_Plane *plane = renderer->plane;
    E_Client *ec = renderer->ec;
-   E_Comp_Wl_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
    E_Comp_Wl_Buffer *buffer = NULL;
    tbm_surface_h tsurface =NULL;
 
@@ -996,7 +996,7 @@ _e_plane_renderer_recover_ec(E_Plane_Renderer *renderer)
    if (!plane->ec_redirected) return;
    if (!ec) return;
 
-   cdata = ec->comp_data;
+   cdata = e_client_cdata_get(ec);
    if (!cdata) return;
    if (!cdata->mapped) return;
 
@@ -1260,6 +1260,7 @@ e_plane_renderer_cursor_surface_refresh(E_Plane_Renderer *renderer, E_Client *ec
    tbm_surface_error_e ret = TBM_SURFACE_ERROR_NONE;
    tbm_surface_info_s tsurface_info;
    E_Pointer *pointer = NULL;
+   E_Comp_Wl_Client_Data *cdata;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(renderer, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
@@ -1270,7 +1271,8 @@ e_plane_renderer_cursor_surface_refresh(E_Plane_Renderer *renderer, E_Client *ec
    output = plane->output;
    EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE);
 
-   buffer = ec->comp_data->buffer_ref.buffer;
+   cdata = e_client_cdata_get(ec);
+   buffer = cdata->buffer_ref.buffer;
    EINA_SAFETY_ON_NULL_RETURN_VAL(buffer, EINA_FALSE);
 
    pointer = e_pointer_get(ec);
@@ -1293,7 +1295,8 @@ e_plane_renderer_cursor_surface_refresh(E_Plane_Renderer *renderer, E_Client *ec
      }
    else
      {
-        ERR("unkown buffer type:%d", ec->comp_data->buffer_ref.buffer->type);
+        E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
+        ERR("unkown buffer type:%d", cdata->buffer_ref.buffer->type);
         return EINA_FALSE;
      }