containing ui setup steps in the profiling again.

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

diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
old mode 100644 (file)
new mode 100755 (executable)
index f31acaa..03ec8b2
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
-       o = evas_object_image_add(evas);
-       o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-       evas_object_image_fill_set(o, 0, 0, 120, 160);
-       evas_object_resize(o, 120, 160);
+
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        efl_file_simple_load(o, build_path("logo.png"), NULL);
+        efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
+        efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        evas_object_color_set(o, a, a, a, a);
-        evas_object_show(o);
+        efl_gfx_color_set(o, a, a, a, a);
+        efl_gfx_entity_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,18 +53,18 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-       h = 160;
-       x = (win_w / 2) - (w / 2);
-       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);
-       evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        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);
+        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;
 }
@@ -96,8 +96,7 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
-   _setup();
+   ui_func_set(_key, _loop, _setup);
 }
 # endif
 #endif