e_comp_wl_video_buffer: change the prefix of buf type

Change-Id: I7b9673c89ba35865dbd5a090973c203b7fdc798e

diff --git a/src/bin/e_comp_wl_screenshooter.c b/src/bin/e_comp_wl_screenshooter.c
index 92b3d2b29d31d2da38a2d9771c3d25664591eeb8..569bd12ee7e6acf8ea4a48faac055ddd2aa19dfc 100644 (file)
--- a/src/bin/e_comp_wl_screenshooter.c
+++ b/src/bin/e_comp_wl_screenshooter.c
@@ -531,7 +531,7 @@ _e_tz_screenmirror_dump_still(E_Mirror_Buffer *buffer)
    int i;
    int rotate = 0;
 
-   if (buffer->vbuf->type == TYPE_SHM)
+   if (buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
      {
         if (!_e_tz_screenmirror_tmp_buffer_create(buffer))
           {
@@ -624,7 +624,7 @@ _e_tz_screenmirror_dump_still(E_Mirror_Buffer *buffer)
 
      }
 
-   if (buffer->vbuf->type == TYPE_SHM)
+   if (buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
      _e_tz_screenmirror_copy_tmp_buffer(buffer);
 }
 
@@ -662,7 +662,7 @@ _e_tz_screenmirror_capture_oneshot_done_handler(tdm_capture *capture, tbm_surfac
    E_Mirror_Buffer *mirror_buffer = user_data;
    E_Mirror *mirror = mirror_buffer->mirror;
 
-   if (mirror_buffer->vbuf->type == TYPE_SHM)
+   if (mirror_buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
      _e_tz_screenmirror_copy_tmp_buffer(mirror_buffer);
 
    _e_tz_screenmirror_destroy(mirror);
@@ -703,7 +703,7 @@ _e_tz_screenmirror_mirrorbuf_find(E_Mirror *mirror, tbm_surface_h surf)
         if (!buffer || !buffer->vbuf)
           continue;
 
-        if (buffer->vbuf->type == TYPE_SHM)
+        if (buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
           {
              if (!buffer->tmp || !buffer->tmp->tbm_surface)
                continue;
@@ -940,7 +940,7 @@ _e_tz_screenmirror_tdm_capture_attach(E_Mirror *mirror, E_Mirror_Buffer *buffer)
 {
    tdm_error err = TDM_ERROR_NONE;
 
-   if (buffer->vbuf->type == TYPE_SHM)
+   if (buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
      {
         if (!_e_tz_screenmirror_tmp_buffer_create(buffer))
           {
@@ -1028,7 +1028,7 @@ _e_tz_screenmirror_buffer_queue(E_Mirror_Buffer *buffer)
           }
         else
           {
-             if (buffer->vbuf->type == TYPE_SHM)
+             if (buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
                {
                   if (!_e_tz_screenmirror_tmp_buffer_create(buffer))
                     {
@@ -1056,7 +1056,7 @@ _e_tz_screenmirror_buffer_queue(E_Mirror_Buffer *buffer)
           }
         else
           {
-             if (buffer->vbuf->type == TYPE_SHM)
+             if (buffer->vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
                {
                   if (!_e_tz_screenmirror_tmp_buffer_create(buffer))
                     {

diff --git a/src/bin/e_comp_wl_video_buffer.c b/src/bin/e_comp_wl_video_buffer.c
index c3c6fb4c38f99651fa8fcdceb030ebde05636f9c..7767db572fc30e8f22480f59f423c198ab08a96b 100644 (file)
--- a/src/bin/e_comp_wl_video_buffer.c
+++ b/src/bin/e_comp_wl_video_buffer.c
@@ -62,7 +62,7 @@ _e_comp_wl_video_buffer_access_data_begin(E_Comp_Wl_Video_Buf *vbuf)
 
    vbuf->ptrs[0] = vbuf->ptrs[1] = vbuf->ptrs[2] = NULL;
 
-   if (vbuf->type == TYPE_SHM)
+   if (vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
      {
         struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get(vbuf->resource);
         EINA_SAFETY_ON_NULL_RETURN_VAL(shm_buffer, EINA_FALSE);
@@ -70,7 +70,7 @@ _e_comp_wl_video_buffer_access_data_begin(E_Comp_Wl_Video_Buf *vbuf)
         EINA_SAFETY_ON_NULL_RETURN_VAL(vbuf->ptrs[0], EINA_FALSE);
         return EINA_TRUE;
      }
-   else if (vbuf->type == TYPE_TBM)
+   else if (vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_TBM)
      {
         int i, j;
         tbm_bo bos[4] = {0,};
@@ -124,11 +124,11 @@ _e_comp_wl_video_buffer_access_data_end(E_Comp_Wl_Video_Buf *vbuf)
 {
    EINA_SAFETY_ON_NULL_RETURN(vbuf);
 
-   if (vbuf->type == TYPE_SHM)
+   if (vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_SHM)
      {
         vbuf->ptrs[0] = NULL;
      }
-   else if (vbuf->type == TYPE_TBM)
+   else if (vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_TBM)
      {
         int i;
         tbm_bo bos[4] = {0,};
@@ -167,7 +167,7 @@ _e_comp_wl_video_buffer_create_res(struct wl_resource *resource)
      {
         uint32_t tbmfmt = wl_shm_buffer_get_format(shm_buffer);
 
-        vbuf->type = TYPE_SHM;
+        vbuf->type = E_COMP_WL_VIDEO_BUF_TYPE_SHM;
 
         if (tbmfmt == WL_SHM_FORMAT_ARGB8888)
           vbuf->tbmfmt = TBM_FORMAT_ARGB8888;
@@ -187,7 +187,7 @@ _e_comp_wl_video_buffer_create_res(struct wl_resource *resource)
      {
         int i;
 
-        vbuf->type = TYPE_TBM;
+        vbuf->type = E_COMP_WL_VIDEO_BUF_TYPE_TBM;
         vbuf->tbm_surface = tbm_surface;
         tbm_surface_internal_ref(tbm_surface);
 
@@ -287,7 +287,7 @@ e_comp_wl_video_buffer_create_tbm(tbm_surface_h tbm_surface)
    while (_find_vbuf(vbuf->stamp))
      vbuf->stamp++;
 
-   vbuf->type = TYPE_TBM;
+   vbuf->type = E_COMP_WL_VIDEO_BUF_TYPE_TBM;
    vbuf->tbm_surface = tbm_surface;
    tbm_surface_internal_ref(tbm_surface);
 
@@ -359,7 +359,7 @@ e_comp_wl_video_buffer_alloc(int width, int height, tbm_format tbmfmt, Eina_Bool
      tbm_surface = tbm_surface_internal_create_with_flags(width, height, tbmfmt, TBM_BO_DEFAULT);
    EINA_SAFETY_ON_NULL_GOTO(tbm_surface, alloc_fail);
 
-   vbuf->type = TYPE_TBM;
+   vbuf->type = E_COMP_WL_VIDEO_BUF_TYPE_TBM;
    vbuf->tbm_surface = tbm_surface;
    tbm_surface_internal_ref(tbm_surface);
 
@@ -481,7 +481,7 @@ _e_comp_wl_video_buffer_free(E_Comp_Wl_Video_Buf *vbuf)
    /* make sure all operation is done */
    VBUF_RETURN_IF_FAIL(vbuf->in_use == EINA_FALSE);
 
-   if (vbuf->type == TYPE_TBM && vbuf->tbm_surface)
+   if (vbuf->type == E_COMP_WL_VIDEO_BUF_TYPE_TBM && vbuf->tbm_surface)
      {
         tbm_surface_internal_unref(vbuf->tbm_surface);
         vbuf->tbm_surface = NULL;

diff --git a/src/bin/e_comp_wl_video_buffer.h b/src/bin/e_comp_wl_video_buffer.h
index a0c5446e35ac3a3515b32a9a0d7bbedfd6491772..b32c19f64ca56a17e0c8321515f2f7ad97d9e9a5 100644 (file)
--- a/src/bin/e_comp_wl_video_buffer.h
+++ b/src/bin/e_comp_wl_video_buffer.h
@@ -2,8 +2,8 @@
 
 typedef enum _E_Comp_Wl_Video_Buf_Type
 {
-   TYPE_SHM,
-   TYPE_TBM,
+   E_COMP_WL_VIDEO_BUF_TYPE_SHM,
+   E_COMP_WL_VIDEO_BUF_TYPE_TBM,
 } E_Comp_Wl_Video_Buf_Type;
 
 typedef struct _E_Comp_Wl_Video_Buf E_Comp_Wl_Video_Buf;