e_mod_effect_rotation: change Evas_Map to E_Map

Change-Id: I3c76096113a2174d992e932ceb2b817a4bb7e18c
Signed-off-by: Junseok, Kim <juns.kim@samsung.com>

diff --git a/src/e_mod_effect_rotation.c b/src/e_mod_effect_rotation.c
index d9ed4289d5a94b811a3deb8b8f45e6efcce702b9..b8e52804f211242eb17dc88bc4453bf54f8f2c97 100644 (file)
--- a/src/e_mod_effect_rotation.c
+++ b/src/e_mod_effect_rotation.c
@@ -266,7 +266,7 @@ _rotation_effect_object_transform_pos_map(E_Client *ec, int sx, int sy, int *dx,
 static void
 _rotation_effect_object_transform_apply(Rotation_Effect_Object *eobj)
 {
-   Evas_Map *map;
+   E_Map *map;
    E_Client *ec;
    int x1, y1, x2, y2, x, y, bw, bh;
    char buffer[128];
@@ -280,7 +280,7 @@ _rotation_effect_object_transform_apply(Rotation_Effect_Object *eobj)
        ec->comp_data->scaler.buffer_viewport.buffer.scale == 1)
      return;
 
-   map = evas_map_new(4);
+   map = e_map_new();
    if (!map) return;
 
    e_pixmap_size_get(ec->pixmap, &bw, &bh);
@@ -289,32 +289,32 @@ _rotation_effect_object_transform_apply(Rotation_Effect_Object *eobj)
    x2 = bw;
    y2 = bh;
 
-   evas_map_util_points_populate_from_geometry(map, ec->x, ec->y, bw, bh, 0);
+   e_map_util_points_populate_from_geometry(map, ec->x, ec->y, bw, bh, 0);
 
    _rotation_effect_object_transform_pos_map(ec, x1, y1, &x, &y);
-   evas_map_point_image_uv_set(map, 0, x, y);
+   e_map_point_image_uv_set(map, 0, x, y);
    l = snprintf(p, remain, " %d,%d", x, y);
    p += l, remain -= l;
 
    _rotation_effect_object_transform_pos_map(ec, x2, y1, &x, &y);
-   evas_map_point_image_uv_set(map, 1, x, y);
+   e_map_point_image_uv_set(map, 1, x, y);
    l = snprintf(p, remain, " %d,%d", x, y);
    p += l, remain -= l;
 
    _rotation_effect_object_transform_pos_map(ec, x2, y2, &x, &y);
-   evas_map_point_image_uv_set(map, 2, x, y);
+   e_map_point_image_uv_set(map, 2, x, y);
    l = snprintf(p, remain, " %d,%d", x, y);
    p += l, remain -= l;
 
    _rotation_effect_object_transform_pos_map(ec, x1, y2, &x, &y);
-   evas_map_point_image_uv_set(map, 3, x, y);
+   e_map_point_image_uv_set(map, 3, x, y);
    l = snprintf(p, remain, " %d,%d", x, y);
    p += l, remain -= l;
 
-   evas_object_map_set(eobj->img, map);
-   evas_object_map_enable_set(eobj->img, EINA_TRUE);
+   e_comp_object_map_set(eobj->img, map);
+   e_comp_object_map_enable_set(eobj->img, EINA_TRUE);
 
-   evas_map_free(map);
+   e_map_free(map);
 }
 
 static void
@@ -745,26 +745,26 @@ _rotation_effect_animator_cb_update(void *data, double pos)
 
    evas_object_geometry_get(ctx_begin->layout, &x, &y, &w, &h);
 
-   Evas_Map *m = evas_map_new(4);
-   evas_map_util_points_populate_from_object(m, ctx_begin->layout);
-   evas_map_util_rotate(m, curr, x + (w/2), y + (h/2));
-   evas_map_alpha_set(m, EINA_TRUE);
-   evas_map_util_points_color_set(m, col, col, col, col);
-   evas_object_map_set(ctx_begin->layout, m);
-   evas_object_map_enable_set(ctx_begin->layout, EINA_TRUE);
-   evas_map_free(m);
+   E_Map *m = e_map_new();
+   e_map_util_points_populate_from_object(m, ctx_begin->layout);
+   e_map_util_rotate(m, curr, x + (w/2), y + (h/2));
+   e_map_alpha_set(m, EINA_TRUE);
+   e_map_util_points_color_set(m, col, col, col, col);
+   e_comp_object_map_set(ctx_begin->layout, m);
+   e_comp_object_map_enable_set(ctx_begin->layout, EINA_TRUE);
+   e_map_free(m);
 
    /* rotation end */
    curr = ((-1.0f * progress * ctx_end->src) + ctx_end->src);
 
    evas_object_geometry_get(ctx_end->layout, &x, &y, &w, &h);
 
-   m = evas_map_new(4);
-   evas_map_util_points_populate_from_object(m, ctx_end->layout);
-   evas_map_util_rotate(m, curr, x + (w/2), y + (h/2));
-   evas_object_map_set(ctx_end->layout, m);
-   evas_object_map_enable_set(ctx_end->layout, EINA_TRUE);
-   evas_map_free(m);
+   m = e_map_new();
+   e_map_util_points_populate_from_object(m, ctx_end->layout);
+   e_map_util_rotate(m, curr, x + (w/2), y + (h/2));
+   e_comp_object_map_set(ctx_end->layout, m);
+   e_comp_object_map_enable_set(ctx_end->layout, EINA_TRUE);
+   e_map_free(m);
 
    return ECORE_CALLBACK_RENEW;
 }