containing ui setup steps in the profiling again.

[platform/upstream/expedite.git] / src / bin / image_blend_occlude2_very_many.c

diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index e3ec9eb..cadd4dc 100755 (executable)
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,11 +27,11 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
-             eo_do(o, efl_file_set(build_path("logo.png"), NULL));
+             efl_file_simple_load(o, build_path("logo.png"), NULL);
           }
         else
           {
@@ -39,14 +39,12 @@ static void _setup(void)
 
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             eo_do(o,
-                   efl_file_set(build_path("image.png"), NULL),
-                   efl_gfx_position_set(x, y));
+             efl_file_simple_load(o, build_path("image.png"), NULL);
+             efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
           }
-        eo_do(o,
-              efl_gfx_fill_set(0, 0, 120, 160),
-              efl_gfx_size_set(120, 160),
-              efl_gfx_visible_set(EINA_TRUE));
+        efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
+        efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
+        efl_gfx_entity_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -55,7 +53,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -73,14 +71,14 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             eo_do(o_images[i], efl_gfx_position_set(x, y));
+             efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
           }
      }
    FPS_STD(NAME);
 }
 
 /* prepend special key handlers if interactive (before STD) */
-static void _key(char *key)
+static void _key(const char *key)
 {
    KEY_STD;
 }
@@ -112,8 +110,7 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
-   _setup();
+   ui_func_set(_key, _loop, _setup);
 }
 # endif
 #endif