video_shell: Replace e_log_client_util_win_get with e_surface_resource_get

It's more explicit to use e_surface_resource_get().

Change-Id: I8333ed5a851bc198ef192e8fdaf152a869606ae5

diff --git a/src/bin/server/e_video_shell.c b/src/bin/server/e_video_shell.c
index db06667dab5a618c1f01c8d596b72f10aa935eca..ae2abd3cca9c1ddd134e583febb659465d0e8584 100644 (file)
--- a/src/bin/server/e_video_shell.c
+++ b/src/bin/server/e_video_shell.c
@@ -589,10 +589,9 @@ static void
 _viewport_name_init(E_Video_Viewport *viewport)
 {
    E_Surface *parent_surface = e_subsurface_parent_try_get(viewport->subsurface);
-   E_Client *parent_ec = e_surface_ec_get(parent_surface);
    char name[256];
 
-   snprintf(name, sizeof(name), "VS::Viewport(Parent 0x%08zx)", e_log_client_util_win_get(parent_ec));
+   snprintf(name, sizeof(name), "VS::Viewport(Parent %p)", e_surface_resource_get(parent_surface));
    e_client_netwm_name_set(e_surface_ec_get(e_subsurface_surface_get(viewport->subsurface)), name);
 }
 
@@ -867,16 +866,16 @@ static char *
 _source_role_handle_debug_str_get(E_Video_Surface_Role *role)
 {
    E_Video_Viewport_Source *source = wl_container_of(role, source, role);
-   E_Client *ec = NULL;
+   E_Surface *viewport_surface = NULL;
    char *debug_str;
    int ret;
 
    if (!source->role.debug_str)
      {
         if (source->viewport)
-          ec = e_surface_ec_get(e_subsurface_surface_get(source->viewport->subsurface));
+          viewport_surface = e_subsurface_surface_get(source->viewport->subsurface);
 
-        ret = asprintf(&debug_str, "Source(Viewport 0x%08zx)", ec != NULL ? e_log_client_util_win_get(ec) : 0);
+        ret = asprintf(&debug_str, "Source(Viewport %p)", viewport_surface ? e_surface_resource_get(viewport_surface) : 0);
         if (ret < 0)
           return NULL;
 
@@ -1436,16 +1435,12 @@ _video_subsurface_role_handle_debug_str_get(E_Video_Surface_Role *role)
 {
    E_Video_Subsurface *subsurface = wl_container_of(role, subsurface, role);
    E_Surface *parent_surface = e_subsurface_parent_try_get(subsurface->subsurface);
-   E_Client *ec = NULL;
    char *debug_str;
    int ret;
 
    if (!subsurface->role.debug_str)
      {
-        if (parent_surface)
-          ec = e_surface_ec_get(parent_surface);
-
-        ret = asprintf(&debug_str, "Subsurface(Parent 0x%08zx)", ec != NULL ? e_log_client_util_win_get(ec) : 0);
+        ret = asprintf(&debug_str, "Subsurface(Parent %p)", parent_surface ? e_surface_resource_get(parent_surface) : 0);
         if (ret < 0)
           return NULL;
 
@@ -1917,6 +1912,7 @@ _viewport_info_print(E_Video_Viewport *viewport, FILE *fp)
 {
    E_Video_Viewport_Source *source;
    E_Client *ec;
+   E_Surface *surface, *parent_surface;
    E_Comp_Wl_Buffer *buffer;
    struct wl_client *client;
    pid_t pid;
@@ -1940,8 +1936,8 @@ _viewport_info_print(E_Video_Viewport *viewport, FILE *fp)
    uuid_unparse(viewport->handle, handle_str);
    fprintf(fp, "\thandle: %s\n", handle_str);
 
-   ec = e_surface_ec_get(e_subsurface_surface_get(viewport->subsurface));
-   fprintf(fp, "\twindow: 0x%08zx\n", e_log_client_util_win_get(ec));
+   surface = e_subsurface_surface_get(viewport->subsurface);
+   fprintf(fp, "\twindow: %p\n", e_surface_resource_get(surface));
 
    e_subsurface_position_get(viewport->subsurface, &x, &y);
    fprintf(fp, "\tposition: %d, %d\n", x, y);
@@ -1949,11 +1945,12 @@ _viewport_info_print(E_Video_Viewport *viewport, FILE *fp)
    fprintf(fp, "\ttransform: %s\n", _viewport_transform_to_str(viewport->current.transform));
    fprintf(fp, "\tmap: %s\n", viewport->current.map ? "true" :  "false");
 
-   ec = e_surface_ec_get(e_subsurface_parent_try_get(viewport->subsurface));
+   parent_surface = e_subsurface_parent_try_get(viewport->subsurface);
+   ec = e_surface_ec_get(parent_surface);
    name = (char *)e_client_netwm_name_get(ec);
    if (!name)
      name = (char *)e_client_icccm_title_get(ec);
-   fprintf(fp, "\tparent: 0x%08zx (%s)\n", e_log_client_util_win_get(ec), name ?: "");
+   fprintf(fp, "\tparent: %p (%s)\n", e_surface_resource_get(parent_surface), name ?: "");
    fprintf(fp, "\t\tmap: %s\n", viewport->parent_mapped ? "true" : "false");
    fprintf(fp, "\t\tvisible: %s\n", evas_object_visible_get(ec->frame) ? "true" : "false");
    e_client_geometry_get(ec, &x, &y, NULL, NULL);
@@ -1966,7 +1963,7 @@ _viewport_info_print(E_Video_Viewport *viewport, FILE *fp)
         name = (char *)e_client_netwm_name_get(ec);
         if (!name)
           name = (char *)e_client_icccm_title_get(ec);
-        fprintf(fp, "\tsource: 0x%08zx (%s)\n", e_log_client_util_win_get(ec), name ?: "");
+        fprintf(fp, "\tsource: %p (%s)\n", e_surface_resource_get(source->surface->surface), name ?: "");
 
         buffer = ec->comp_data->buffer_ref.buffer;
         fprintf(fp, "\t\tbuffer: %p", buffer);