Revert "ecore_audio, ecore_buffer, ecore_wl2 : Fix build warnings."

This patch cause the ecore_buffer_register tc break,
then this need to revert temporary.

This reverts commit f8f770ebf854d725b3bf8a2ec10f7526960fd5e2.

Change-Id: I75e6cbf3654dfbc62941715fe7272846f2ac93e7

diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_tizen.c b/src/lib/ecore_audio/ecore_audio_obj_out_tizen.c
index eb0dc29..6ed0429 100644 (file)
--- a/src/lib/ecore_audio/ecore_audio_obj_out_tizen.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_tizen.c
@@ -185,6 +185,9 @@ _ecore_audio_out_tizen_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
 EOLIAN static Eo *
 _ecore_audio_out_tizen_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Tizen_Data *_td)
 {
+
+   Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
+
    eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
 
    if (!_module_load(_td))

diff --git a/src/lib/ecore_buffer/Ecore_Buffer.h b/src/lib/ecore_buffer/Ecore_Buffer.h
index 0393e92..7bd6f14 100644 (file)
--- a/src/lib/ecore_buffer/Ecore_Buffer.h
+++ b/src/lib/ecore_buffer/Ecore_Buffer.h
@@ -493,7 +493,6 @@ struct _Ecore_Buffer_Backend
                                                int width, int height,
                                                Ecore_Buffer_Format format,
                                                unsigned int flags); /**< Newly allocate memory for buffer */
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
    Ecore_Buffer_Data           (*buffer_alloc_with_tbm_surface)(Ecore_Buffer_Module_Data bmdata,
                                                                 void *tbm_surface,
                                                                 int *ret_w, int *ret_h,
@@ -502,7 +501,6 @@ struct _Ecore_Buffer_Backend
    Eina_Bool                   (*buffer_info_get)(Ecore_Buffer_Module_Data bmdata,
                                                   Ecore_Buffer_Data bdata,
                                                   Ecore_Buffer_Info *info);
-   //
    void                        (*buffer_free)(Ecore_Buffer_Module_Data bmdata,
                                               Ecore_Buffer_Data bdata); /**< Free allocated memory */
    Ecore_Export_Type           (*buffer_export)(Ecore_Buffer_Module_Data bmdata,
@@ -512,10 +510,6 @@ struct _Ecore_Buffer_Backend
                                                 Ecore_Export_Type type,
                                                 int export_id,
                                                 unsigned int flags); /**< Import and create Ecore_Buffer from id or fd */
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-   void                       *(*data_get)(Ecore_Buffer_Module_Data bmdata,
-                                           Ecore_Buffer_Data bdata);
-   //
    Ecore_Pixmap                (*pixmap_get)(Ecore_Buffer_Module_Data bmdata,
                                              Ecore_Buffer_Data bdata); /**< Get the pixmap handle */
    void                       *(*tbm_surface_get)(Ecore_Buffer_Module_Data bmdata,

diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index 54e45c2..67dca7b 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -520,7 +520,7 @@ _tizen_appinfo_cb_base_output_resolution_done(void *data, struct tizen_launch_ap
    Ecore_Wl2_Display *ewd = data;
 
    if (!ewd) return;
-   if ((unsigned int)_base_resolution_pid != pid)
+   if (_base_resolution_pid != pid)
      {
         ERR("tzappinfo_cb_size_get_done pid is different. pid: %d / width: %d / height: %d appinfo_pid: %d", pid, width, height, _base_resolution_pid);
         return;
@@ -677,7 +677,7 @@ static const struct tizen_screen_rotation_listener _tizen_screen_rotation_listen
 };
 
 static void
-_tizen_move_resize_cb_geometry_done(void *data EINA_UNUSED, struct tizen_move_resize *tz_moveresize EINA_UNUSED, struct wl_surface *surface EINA_UNUSED, uint32_t serial EINA_UNUSED, int32_t x EINA_UNUSED, int32_t y EINA_UNUSED, int32_t w EINA_UNUSED, int32_t h EINA_UNUSED, uint32_t err EINA_UNUSED)
+_tizen_move_resize_cb_geometry_done(void *data EINA_UNUSED, struct tizen_move_resize *tz_moveresize EINA_UNUSED, struct wl_surface *surface EINA_UNUSED, uint32_t serial EINA_UNUSED, int32_t x EINA_UNUSED, int32_t y EINA_UNUSED, int32_t w EINA_UNUSED, int32_t h EINA_UNUSED, int32_t err EINA_UNUSED)
 {
    /* to be implemented*/
 }
@@ -905,7 +905,7 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const
         ewd->wl.tz_moveresize =
            wl_registry_bind(registry, id, &tizen_move_resize_interface, 1);
         if (ewd->wl.tz_moveresize)
-          tizen_move_resize_add_listener(ewd->wl.tz_moveresize, &_tizen_move_resize_listener, ewd->wl.display);
+          tizen_screen_rotation_add_listener(ewd->wl.tz_moveresize, &_tizen_move_resize_listener, ewd->wl.display);
      }
 //
 // TIZEN_ONLY(20190430): support client appinfo
@@ -1371,7 +1371,7 @@ _ecore_wl2_display_dispatch_error(Ecore_Wl2_Display *ewd)
    uint32_t ecode = 0, id = 0;
    const struct wl_interface *intf = NULL;
    int last_err;
-   const char *str;
+   char *str;
 
    /* write out message about protocol error */
    ecode = wl_display_get_protocol_error(ewd->wl.display, &intf, &id);

diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c
index 09bef26..d14a503 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -1352,6 +1352,7 @@ static Eina_Bool
 _keyboard_cb_repeat(void *data)
 {
    Ecore_Wl2_Input *input;
+   Ecore_Wl2_Window *window;
 
    input = data;
    if (!input) return ECORE_CALLBACK_RENEW;
@@ -2484,7 +2485,7 @@ _ecore_wl2_cb_key_cancel(void *data, struct tizen_keyrouter *tizen_keyrouter EIN
 }
 
 static void
-_ecore_wl2_cb_event_surface(void *data, struct tizen_keyrouter *tizen_keyrouter EINA_UNUSED, struct wl_surface *surface, uint32_t key EINA_UNUSED, uint32_t mode)
+_ecore_wl2_cb_event_surface(void *data, struct tizen_keyrouter *tizen_keyrouter EINA_UNUSED, struct wl_surface *surface, uint32_t mode)
 {
    Ecore_Wl2_Display *ewd = (Ecore_Wl2_Display *)data;
    Ecore_Wl2_Input *input;

diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index c99a04d..d2a697b 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -6,7 +6,6 @@
 # include "Ecore_Input.h"
 # include <xkbcommon/xkbcommon-compose.h>
 # include "www-client-protocol.h"
-# include "ecore_wl2_internal.h"
 
 # define EFL_TEAMWORK_VERSION 2
 # include "teamwork-client-protocol.h"

diff --git a/src/lib/ecore_wl2/ecore_wl2_tbmsurface.c b/src/lib/ecore_wl2/ecore_wl2_tbmsurface.c
index 00a99a8..4d0545c 100755 (executable)
--- a/src/lib/ecore_wl2/ecore_wl2_tbmsurface.c
+++ b/src/lib/ecore_wl2/ecore_wl2_tbmsurface.c
@@ -69,7 +69,7 @@ _evas_tbmbuf_surface_reconfigure(Ecore_Wl2_Surface *surface, void *priv_data, in
   if (w < 1) w = 1;
   if (h < 1) h = 1;
 
-  if ((w >= surf->w) && (w <= (int)surf->stride / 4) && (h == surf->h))
+  if ((w >= surf->w) && (w <= surf->stride / 4) && (h == surf->h))
     {
       surf->w = w;
       return;

diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index a7e2d3c..7790f92 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -406,7 +406,7 @@ _ecore_wl2_window_xdg_popup_create(Ecore_Wl2_Window *win)
    EINA_SAFETY_ON_NULL_RETURN(win->parent);
    if (!win->parent->zxdg_surface) return;
 
-   pos = xdg_wm_base_create_positioner(win->display->wl.xdg_wm_base);
+   pos = zxdg_shell_v6_create_positioner(win->display->wl.zxdg_shell);
    if (!pos) return;
 
    ecore_wl2_window_geometry_get(win, NULL, NULL, &gw, &gh);

diff --git a/src/modules/ecore_buffer/shm/ecore_buffer_shm.c b/src/modules/ecore_buffer/shm/ecore_buffer_shm.c
index 784fe12..bb3c1d6 100644 (file)
--- a/src/modules/ecore_buffer/shm/ecore_buffer_shm.c
+++ b/src/modules/ecore_buffer/shm/ecore_buffer_shm.c
@@ -112,10 +112,8 @@ _ecore_buffer_shm_buffer_export(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, Eco
    return EXPORT_TYPE_FD;
 }
 
-//TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
 static void *
-//_ecore_buffer_shm_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, int w, int h, Ecore_Buffer_Format format EINA_UNUSED, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
-_ecore_buffer_shm_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, Ecore_Buffer_Info *einfo, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
+_ecore_buffer_shm_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, int w, int h, Ecore_Buffer_Format format EINA_UNUSED, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
 {
    Ecore_Buffer_Shm_Data* b;
    int fd, page_size;
@@ -128,14 +126,9 @@ _ecore_buffer_shm_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, Eco
    page_size = eina_cpu_page_size();
 
    fd = export_id;
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-   //b->w = w;
-   //b->h = h;
-   //b->stride = w * sizeof(int);
-   b->w = einfo->width;
-   b->h = einfo->height;
-   b->stride = einfo->planes[0].stride;
-   //
+   b->w = w;
+   b->h = h;
+   b->stride = w * sizeof(int);
    b->size = page_size * (((b->stride * b->h) + (page_size - 1)) / page_size);
    b->am_owner = EINA_FALSE;
 
@@ -161,10 +154,6 @@ static Ecore_Buffer_Backend _ecore_buffer_shm_backend = {
      NULL,
      NULL,
      &_ecore_buffer_shm_buffer_alloc,
-     //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-     NULL,
-     NULL,
-     //
      &_ecore_buffer_shm_buffer_free,
      &_ecore_buffer_shm_buffer_export,
      &_ecore_buffer_shm_buffer_import,

diff --git a/src/modules/ecore_buffer/tbm/ecore_buffer_tbm.c b/src/modules/ecore_buffer/tbm/ecore_buffer_tbm.c
index 6de543c..27960f0 100644 (file)
--- a/src/modules/ecore_buffer/tbm/ecore_buffer_tbm.c
+++ b/src/modules/ecore_buffer/tbm/ecore_buffer_tbm.c
@@ -429,7 +429,6 @@ static Ecore_Buffer_Backend _ecore_buffer_tbm_backend = {
      &_ecore_buffer_tbm_buffer_export,
      &_ecore_buffer_tbm_buffer_import,
      NULL,
-     NULL,
      &_ecore_buffer_tbm_tbm_bo_get,
 };
 

diff --git a/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c b/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
index 61cb3e4..d673fac 100644 (file)
--- a/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
+++ b/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
@@ -407,10 +407,8 @@ _ecore_buffer_x11_dri2_buffer_export(Ecore_Buffer_Module_Data bmdata EINA_UNUSED
    return EXPORT_TYPE_ID;
 }
 
-//TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
 static void *
-//_ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, int w, int h, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
-_ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, Ecore_Buffer_Info *einfo, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
+_ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, int w, int h, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
 {
    Ecore_Buffer_Module_X11_Dri2_Data *bm = bmdata;
    Ecore_X_Display *xdpy;
@@ -438,14 +436,9 @@ _ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED
    if (!buf)
      return NULL;
 
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-   //buf->w = w;
-   //buf->h = h;
-   //buf->format = format;
-   buf->w = einfo->width;
-   buf->h = einfo->height;
-   buf->format = einfo->format;
-   //
+   buf->w = w;
+   buf->h = h;
+   buf->format = format;
    buf->pixmap = pixmap;
    buf->is_imported = EINA_TRUE;
 
@@ -463,22 +456,14 @@ _ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED
      goto on_error;
 
    num_plane = _buf_get_num_planes(format);
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-   //info.width = w;
-   //info.height = h;
-   //info.format = format;
-   info.width = einfo->width;
-   info.height = einfo->height;
-   info.format = einfo->format;
+   info.width = w;
+   info.height = h;
+   info.format = format;
    info.bpp = _buf_get_bpp(format);
-
-   //info.size = w * bufs->pitch;
-   info.size = einfo->width * bufs->pitch;
+   info.size = w * bufs->pitch;
    for ( i = 0 ; i < num_plane ; i++)
    {
-      //info.planes[i].size = w * bufs->pitch;
-      info.planes[i].size = einfo->width * bufs->pitch;
-   //
+      info.planes[i].size = w * bufs->pitch;
       info.planes[i].stride = bufs->pitch;
       info.planes[i].offset = 0;
    }
@@ -531,10 +516,6 @@ static Ecore_Buffer_Backend _ecore_buffer_x11_dri2_backend = {
      &_ecore_buffer_x11_dri2_init,
      &_ecore_buffer_x11_dri2_shutdown,
      &_ecore_buffer_x11_dri2_buffer_alloc,
-     //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-     NULL,
-     NULL,
-     //
      &_ecore_buffer_x11_dri2_buffer_free,
      &_ecore_buffer_x11_dri2_buffer_export,
      &_ecore_buffer_x11_dri2_buffer_import,

diff --git a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
index 55eca81..d3ab703 100644 (file)
--- a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
+++ b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
@@ -462,10 +462,8 @@ _ecore_buffer_x11_dri3_buffer_export(Ecore_Buffer_Module_Data bmdata EINA_UNUSED
    return EXPORT_TYPE_FD;
 }
 
-//TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
 static Ecore_Buffer_Data
-//_ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, int w, int h, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags)
-_ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, Ecore_Buffer_Info *einfo, Ecore_Export_Type type, int export_id, unsigned int flags)
+_ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, int w, int h, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags)
 {
    Ecore_Buffer_Module_X11_Dri3_Data *bm = bmdata;
    Ecore_Buffer_X11_Dri3_Data *buf;
@@ -486,14 +484,9 @@ _ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, Ecore_Buff
    if (!buf)
      return NULL;
 
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-   //buf->w = w;
-   //buf->h = h;
-   //buf->format = format;
-   buf->w = einfo->width;
-   buf->h = einfo->height;
-   buf->format = einfo->format;
-   //
+   buf->w = w;
+   buf->h = h;
+   buf->format = format;
    buf->flags = flags;
    buf->is_imported = EINA_TRUE;
 
@@ -506,23 +499,15 @@ _ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, Ecore_Buff
      }
 
    num_plane = _buf_get_num_planes(format);
-   //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-   //info.width = w;
-   //info.height = h;
-   //info.format = format;
-   info.width = einfo->width;
-   info.height = einfo->height;
-   info.format = einfo->format;
+   info.width = w;
+   info.height = h;
+   info.format = format;
    info.bpp = _buf_get_bpp(format);
-   //info.size = w * h * info.bpp;
-   info.size einfo->width * einfo->height * info.bpp;
+   info.size = w * h * info.bpp;
    for ( i = 0 ; i < num_plane ; i++)
    {
-      //info.planes[i].size = w * h * info.bpp;
-      //info.planes[i].stride = w * info.bpp;
-      info.planes[i].size = einfo->width * einfo->height * info.bpp;
-      info.planes[i].stride = einfo->width * info.bpp;
-   //
+      info.planes[i].size = w * h * info.bpp;
+      info.planes[i].stride = w * info.bpp;
       info.planes[i].offset = 0;
    }
 
@@ -595,10 +580,6 @@ static Ecore_Buffer_Backend _ecore_buffer_x11_dri3_backend = {
      &_ecore_buffer_x11_dri3_init,
      &_ecore_buffer_x11_dri3_shutdown,
      &_ecore_buffer_x11_dri3_buffer_alloc,
-     //TIZEN_ONLY(20191129): _Ecore_Buffer_Backend has broken for Tizen Only module.
-     NULL,
-     NULL,
-     //
      &_ecore_buffer_x11_dri3_buffer_free,
      &_ecore_buffer_x11_dri3_buffer_export,
      &_ecore_buffer_x11_dri3_buffer_import,

diff --git a/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c b/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c
index cd9c16d..d1c1015 100644 (file)
--- a/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c
+++ b/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c
@@ -237,7 +237,7 @@ _evas_dmabuf_surface_flush(Ecore_Wl2_Surface *surface EINA_UNUSED, void *priv_da
 }
 
 static void
-_evas_dmabuf_surface_set_serial(Ecore_Wl2_Surface *surface EINA_UNUSED, void *priv_data EINA_UNUSED, unsigned int count EINA_UNUSED)
+_evas_dmabuf_surface_set_serial(Ecore_Wl2_Surface *surface EINA_UNUSED, void *priv_data, unsigned int count)
 {
 }