summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2014-08-22 00:48:19 +0200
committerCedric BAIL <cedric@osg.samsung.com>2014-08-22 18:29:02 +0200
commit3ef31223f6bbe9565ba41a857eee7926f931eaa5 (patch)
treeb1350d117930a82af7d93a6398e2ed968511e507
parent281bbd90fdb3942922e931bcd7f364e9204a1488 (diff)
cleanup, remove warning, useless if and tab .
-rw-r--r--src/bin/about.c21
-rw-r--r--src/bin/image_blend_border.c16
-rw-r--r--src/bin/image_blend_border_recolor.c18
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c17
-rw-r--r--src/bin/image_blend_fade_unscaled.c16
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c6
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c16
-rw-r--r--src/bin/image_blend_nearest_scaled.c16
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c16
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c16
-rw-r--r--src/bin/image_blend_occlude1.c21
-rw-r--r--src/bin/image_blend_occlude1_few.c21
-rw-r--r--src/bin/image_blend_occlude1_many.c21
-rw-r--r--src/bin/image_blend_occlude1_very_many.c21
-rw-r--r--src/bin/image_blend_occlude2.c21
-rw-r--r--src/bin/image_blend_occlude2_few.c21
-rw-r--r--src/bin/image_blend_occlude2_many.c21
-rw-r--r--src/bin/image_blend_occlude2_very_many.c21
-rw-r--r--src/bin/image_blend_occlude3.c21
-rw-r--r--src/bin/image_blend_occlude3_few.c21
-rw-r--r--src/bin/image_blend_occlude3_many.c21
-rw-r--r--src/bin/image_blend_occlude3_very_many.c21
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c16
-rw-r--r--src/bin/image_blend_smooth_scaled.c16
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c16
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c16
-rw-r--r--src/bin/image_blend_solid_border.c16
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c17
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c17
-rw-r--r--src/bin/image_blend_solid_middle_border.c18
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c17
-rw-r--r--src/bin/image_blend_solid_unscaled.c13
-rw-r--r--src/bin/image_blend_unscaled.c13
-rw-r--r--src/bin/image_crossfade.c23
-rw-r--r--src/bin/image_data_argb.c34
-rw-r--r--src/bin/image_data_argb_alpha.c34
-rw-r--r--src/bin/image_data_ycbcr601pl.c36
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c34
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c32
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c47
-rw-r--r--src/bin/image_map_3d_1.c31
-rw-r--r--src/bin/image_map_3d_2.c29
-rw-r--r--src/bin/image_map_3d_3.c24
-rw-r--r--src/bin/image_map_3d_4.c20
-rw-r--r--src/bin/image_map_3d_5.c31
-rw-r--r--src/bin/image_map_3d_6.c31
-rw-r--r--src/bin/image_map_3d_flow.c53
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c18
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c18
-rw-r--r--src/bin/image_map_color_alpha_rotate.c16
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c16
-rw-r--r--src/bin/image_map_color_nearest_rotate.c18
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c18
-rw-r--r--src/bin/image_map_color_rotate.c16
-rw-r--r--src/bin/image_map_color_solid_rotate.c16
-rw-r--r--src/bin/image_map_nearest_rotate.c18
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c10
-rw-r--r--src/bin/image_map_rotate.c2
-rw-r--r--src/bin/image_map_solid_rotate.c16
-rw-r--r--src/bin/image_quality_scale.c2
-rw-r--r--src/bin/proxy_image.c23
-rw-r--r--src/bin/proxy_image_offscreen.c23
-rw-r--r--src/bin/proxy_text_fixed.c36
-rw-r--r--src/bin/proxy_text_random.c62
-rw-r--r--src/bin/rect_blend.c12
-rw-r--r--src/bin/rect_blend_few.c2
-rw-r--r--src/bin/rect_blend_pow2.c12
-rw-r--r--src/bin/rect_blend_pow2_few.c2
-rw-r--r--src/bin/rect_solid.c12
-rw-r--r--src/bin/rect_solid_few.c2
-rw-r--r--src/bin/text_basic.c27
-rw-r--r--src/bin/text_change.c4
-rw-r--r--src/bin/text_styles.c26
-rw-r--r--src/bin/text_styles_different_strings.c4
-rw-r--r--src/bin/textblock_auto_align.c29
-rw-r--r--src/bin/textblock_basic.c25
-rw-r--r--src/bin/textblock_intl.c28
-rw-r--r--src/bin/textblock_text_append.c27
-rw-r--r--src/bin/widgets_file_icons.c7
-rw-r--r--src/bin/widgets_file_icons_2.c7
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c7
-rw-r--r--src/bin/widgets_file_icons_2_same.c7
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c7
-rw-r--r--src/bin/widgets_file_icons_3.c7
-rw-r--r--src/bin/widgets_file_icons_4.c7
-rw-r--r--src/bin/widgets_list_1.c7
-rw-r--r--src/bin/widgets_list_1_grouped.c7
-rw-r--r--src/bin/widgets_list_2.c7
-rw-r--r--src/bin/widgets_list_2_grouped.c7
-rw-r--r--src/bin/widgets_list_3.c9
-rw-r--r--src/bin/widgets_list_3_grouped.c12
-rw-r--r--src/bin/widgets_list_4_grouped.c9
92 files changed, 801 insertions, 890 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index a6a7b5d..10f6949 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -9,10 +9,9 @@ _setup(void)
9 Evas_Textblock_Style *st; 9 Evas_Textblock_Style *st;
10 10
11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
12 if (o) 12 eo_do(o, evas_obj_position_set(10, 40),
13 eo_do(o, evas_obj_position_set(10, 40), 13 evas_obj_size_set(win_w - 20, win_h - 50),
14 evas_obj_size_set(win_w - 20, win_h - 50), 14 evas_obj_visibility_set(EINA_TRUE));
15 evas_obj_visibility_set(EINA_TRUE));
16 st = evas_textblock_style_new(); 15 st = evas_textblock_style_new();
17 evas_textblock_style_set 16 evas_textblock_style_set
18 (st, 17 (st,
@@ -22,10 +21,9 @@ _setup(void)
22 "p='+ font=Vera font_size=10 align=left'" 21 "p='+ font=Vera font_size=10 align=left'"
23 "/p='- \n \n'" 22 "/p='- \n \n'"
24 ); 23 );
25 if (o) 24 eo_do(o, evas_obj_textblock_style_set(st),
26 eo_do(o, evas_obj_textblock_style_set(st), 25 evas_obj_textblock_clear(),
27 evas_obj_textblock_clear(), 26 evas_obj_textblock_text_markup_set
28 evas_obj_textblock_text_markup_set
29 ("<center>" 27 ("<center>"
30 "Enlightenment used to be a window manager project, but " 28 "Enlightenment used to be a window manager project, but "
31 "since has changed a lot to become a miniature desktop and mobile " 29 "since has changed a lot to become a miniature desktop and mobile "
@@ -57,7 +55,8 @@ _cleanup(void)
57} 55}
58 56
59static void 57static void
60_loop(double t __UNUSED__, int f __UNUSED__) 58_loop(double t EINA_UNUSED,
59 int f EINA_UNUSED)
61{ 60{
62} 61}
63 62
@@ -66,8 +65,8 @@ _key(char *key)
66{ 65{
67 if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q"))) 66 if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q")))
68 { 67 {
69 _cleanup(); 68 _cleanup();
70 ui_menu(); 69 ui_menu();
71 } 70 }
72} 71}
73 72
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index ff2dfee..d8d1361 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL), 29 evas_obj_image_file_set(build_path("bar.png"), NULL),
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_set(6, 6, 6, 6),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 54527f8..5079bb7 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -25,11 +25,11 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL), 29 evas_obj_image_file_set(build_path("pan.png"), NULL),
30 evas_obj_color_set(64, 64, 64, 255), 30 evas_obj_color_set(64, 64, 64, 255),
31 evas_obj_image_border_set(3, 3, 3, 3), 31 evas_obj_image_border_set(3, 3, 3, 3),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -56,10 +56,10 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
57 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
59 if (o_images[i]) 59 eo_do(o_images[i],
60 eo_do(o_images[i], evas_obj_position_set(x, y), 60 evas_obj_position_set(x, y),
61 evas_obj_size_set(w, h), 61 evas_obj_size_set(w, h),
62 evas_obj_image_fill_set(0, 0, w, h)); 62 evas_obj_image_fill_set(0, 0, w, h));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 3aab91d..8b2f9a4 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -27,15 +27,15 @@ static void _setup(void)
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 if (o) 30 eo_do(o,
31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 31 evas_obj_image_file_set(build_path("logo.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 evas_obj_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 if (a < 128) a = 128;
36 if (o) 36 eo_do(o,
37 eo_do(o, evas_obj_color_set(a, a, a, a), 37 evas_obj_color_set(a, a, a, a),
38 evas_obj_visibility_set(EINA_TRUE)); 38 evas_obj_visibility_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -60,8 +60,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 61 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 if (o_images[i]) 63 eo_do(o_images[i], evas_obj_position_set(x, y));
64 eo_do(o_images[i], evas_obj_position_set(x, y));
65 } 64 }
66 FPS_STD(NAME); 65 FPS_STD(NAME);
67} 66}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 06e4980..6796b16 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -26,14 +26,13 @@ static void _setup(void)
26 int a; 26 int a;
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o)
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160));
33 a = rnd()&0xff; 29 a = rnd()&0xff;
34 if (o) 30 eo_do(o,
35 eo_do(o, evas_obj_color_set(a, a, a, a), 31 evas_obj_image_file_set(build_path("logo.png"), NULL),
36 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160),
34 evas_obj_color_set(a, a, a, a),
35 evas_obj_visibility_set(EINA_TRUE));
37 } 36 }
38 done = 0; 37 done = 0;
39} 38}
@@ -58,8 +57,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 if (o_images[i]) 60 eo_do(o_images[i], evas_obj_position_set(x, y));
62 eo_do(o_images[i], evas_obj_position_set(x, y));
63 } 61 }
64 FPS_STD(NAME); 62 FPS_STD(NAME);
65} 63}
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index eb29468..380e7ac 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -30,8 +30,7 @@ static void _setup(void)
30 n = rnd() % 100; 30 n = rnd() % 100;
31 w = 3 + ((n * (60 - 3)) / 100); 31 w = 3 + ((n * (60 - 3)) / 100);
32 h = 4 + ((n * (80 - 4)) / 100); 32 h = 4 + ((n * (80 - 4)) / 100);
33 if (o) 33 eo_do(o,
34 eo_do(o,
35 evas_obj_image_file_set(build_path("logo.png"), NULL), 34 evas_obj_image_file_set(build_path("logo.png"), NULL),
36 evas_obj_image_smooth_scale_set(1), 35 evas_obj_image_smooth_scale_set(1),
37 evas_obj_size_set(w, h), 36 evas_obj_size_set(w, h),
@@ -60,8 +59,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
61 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
63 if (o_images[i]) 62 eo_do(o_images[i], evas_obj_position_set(x, y));
64 eo_do(o_images[i], evas_obj_position_set(x, y));
65 } 63 }
66 FPS_STD(NAME); 64 FPS_STD(NAME);
67} 65}
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 9567181..52b0b09 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 evas_obj_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index ad84c44..0b32d37 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 evas_obj_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 048b77f..2751315 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 29 evas_obj_image_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 evas_obj_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 1dc759a..9aa06de 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 29 evas_obj_image_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 evas_obj_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 8428973..e62e520 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -28,24 +28,22 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 { 30 {
31 if (o) 31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
32 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
33 } 32 }
34 else 33 else
35 { 34 {
36 Evas_Coord x, y; 35 Evas_Coord x, y;
37 36
38 if (o)
39 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 if (o) 39 eo_do(o,
43 eo_do(o, evas_obj_position_set(x, y)); 40 evas_obj_image_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y));
44 } 42 }
45 if (o) 43 eo_do(o,
46 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 44 evas_obj_image_fill_set(0, 0, 120, 160),
47 evas_obj_size_set(120, 160), 45 evas_obj_size_set(120, 160),
48 evas_obj_visibility_set(EINA_TRUE)); 46 evas_obj_visibility_set(EINA_TRUE));
49 } 47 }
50 done = 0; 48 done = 0;
51} 49}
@@ -72,8 +70,7 @@ static void _loop(double t, int f)
72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
73 y = (win_h / 2) - (h / 2); 71 y = (win_h / 2) - (h / 2);
74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
75 if (o_images[i]) 73 eo_do(o_images[i], evas_obj_position_set(x, y));
76 eo_do(o_images[i], evas_obj_position_set(x, y));
77 } 74 }
78 } 75 }
79 FPS_STD(NAME); 76 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index 02a1c02..b36830e 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
35 eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index d39b169..6ac4388 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 15013f8..09feea6 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 9463c00..9dea32d 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -28,24 +28,22 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 { 30 {
31 if (o) 31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
32 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
33 } 32 }
34 else 33 else
35 { 34 {
36 Evas_Coord x, y; 35 Evas_Coord x, y;
37 36
38 if (o)
39 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 if (o) 39 eo_do(o,
43 eo_do(o, evas_obj_position_set(x, y)); 40 evas_obj_image_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y));
44 } 42 }
45 if (o) 43 eo_do(o,
46 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 44 evas_obj_image_fill_set(0, 0, 120, 160),
47 evas_obj_size_set(120, 160), 45 evas_obj_size_set(120, 160),
48 evas_obj_visibility_set(EINA_TRUE)); 46 evas_obj_visibility_set(EINA_TRUE));
49 } 47 }
50 done = 0; 48 done = 0;
51} 49}
@@ -72,8 +70,7 @@ static void _loop(double t, int f)
72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
73 y = (win_h / 2) - (h / 2); 71 y = (win_h / 2) - (h / 2);
74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
75 if (o_images[i]) 73 eo_do(o_images[i], evas_obj_position_set(x, y));
76 eo_do(o_images[i], evas_obj_position_set(x, y));
77 } 74 }
78 } 75 }
79 FPS_STD(NAME); 76 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 247784d..245a5b3 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 3fb7126..9bde567 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 204d418..ee25519 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 629fbcb..5820130 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -28,24 +28,22 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 { 30 {
31 if (o) 31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
32 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
33 } 32 }
34 else 33 else
35 { 34 {
36 Evas_Coord x, y; 35 Evas_Coord x, y;
37 36
38 if (o)
39 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 if (o) 39 eo_do(o,
43 eo_do(o, evas_obj_position_set(x, y)); 40 evas_obj_image_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y));
44 } 42 }
45 if (o) 43 eo_do(o,
46 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 44 evas_obj_image_fill_set(0, 0, 120, 160),
47 evas_obj_size_set(120, 160), 45 evas_obj_size_set(120, 160),
48 evas_obj_visibility_set(EINA_TRUE)); 46 evas_obj_visibility_set(EINA_TRUE));
49 } 47 }
50 done = 0; 48 done = 0;
51} 49}
@@ -72,8 +70,7 @@ static void _loop(double t, int f)
72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
73 y = (win_h / 2) - (h / 2); 71 y = (win_h / 2) - (h / 2);
74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
75 if (o_images[i]) 73 eo_do(o_images[i], evas_obj_position_set(x, y));
76 eo_do(o_images[i], evas_obj_position_set(x, y));
77 } 74 }
78 } 75 }
79 FPS_STD(NAME); 76 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 25dc0f2..784f0db 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 96c873b..0119a72 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 097d20b..25bed57 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 if (o) 34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
35 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
36 } 35 }
37 else 36 else
38 { 37 {
39 Evas_Coord x, y; 38 Evas_Coord x, y;
40 39
41 if (o)
42 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 if (o) 42 eo_do(o,
46 eo_do(o, evas_obj_position_set(x, y)); 43 evas_obj_image_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y));
47 } 45 }
48 if (o) 46 eo_do(o,
49 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160), 47 evas_obj_image_fill_set(0, 0, 120, 160),
50 evas_obj_size_set(120, 160), 48 evas_obj_size_set(120, 160),
51 evas_obj_visibility_set(EINA_TRUE)); 49 evas_obj_visibility_set(EINA_TRUE));
52 } 50 }
53 done = 0; 51 done = 0;
54} 52}
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
78 if (o_images[i]) 76 eo_do(o_images[i], evas_obj_position_set(x, y));
79 eo_do(o_images[i], evas_obj_position_set(x, y));
80 } 77 }
81 } 78 }
82 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 7fe2287..ff0bdd5 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 evas_obj_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 0c302a8..6247db1 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 evas_obj_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index df61030..1f24762 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 29 evas_obj_image_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 evas_obj_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 2ea4525..d7da8cf 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 29 evas_obj_image_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 evas_obj_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 62ab251..752bbe5 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -25,10 +25,10 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL), 29 evas_obj_image_file_set(build_path("frame.png"), NULL),
30 evas_obj_image_border_set(8, 8, 8, 8), 30 evas_obj_image_border_set(8, 8, 8, 8),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 if (o_images[i]) 58 eo_do(o_images[i],
59 eo_do(o_images[i], evas_obj_position_set(x, y), 59 evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 60 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 54b4f0f..4d33565 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -27,15 +27,15 @@ static void _setup(void)
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 if (o) 30 eo_do(o,
31 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 31 evas_obj_image_file_set(build_path("image.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 evas_obj_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 if (a < 128) a = 128;
36 if (o) 36 eo_do(o,
37 eo_do(o, evas_obj_color_set(a, a, a, a), 37 evas_obj_color_set(a, a, a, a),
38 evas_obj_visibility_set(EINA_TRUE)); 38 evas_obj_visibility_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -60,8 +60,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 61 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 if (o_images[i]) 63 eo_do(o_images[i], evas_obj_position_set(x, y));
64 eo_do(o_images[i], evas_obj_position_set(x, y));
65 } 64 }
66 FPS_STD(NAME); 65 FPS_STD(NAME);
67} 66}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index f2cf861..5331f39 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -27,14 +27,14 @@ static void _setup(void)
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 if (o) 30 eo_do(o,
31 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 31 evas_obj_image_file_set(build_path("image.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 evas_obj_size_set(120, 160));
34 a = rnd()&0xff; 34 a = rnd()&0xff;
35 if (o) 35 eo_do(o,
36 eo_do(o, evas_obj_color_set(a, a, a, a), 36 evas_obj_color_set(a, a, a, a),
37 evas_obj_visibility_set(EINA_TRUE)); 37 evas_obj_visibility_set(EINA_TRUE));
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -59,8 +59,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
62 if (o_images[i]) 62 eo_do(o_images[i], evas_obj_position_set(x, y));
63 eo_do(o_images[i], evas_obj_position_set(x, y));
64 } 63 }
65 FPS_STD(NAME); 64 FPS_STD(NAME);
66} 65}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 8e5c7de..72e8850 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -25,11 +25,11 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL), 29 evas_obj_image_file_set(build_path("bar.png"), NULL),
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_set(6, 6, 6, 6),
31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -56,10 +56,10 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
57 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
59 if (o_images[i]) 59 eo_do(o_images[i],
60 eo_do(o_images[i], evas_obj_position_set(x, y), 60 evas_obj_position_set(x, y),
61 evas_obj_size_set(w, h), 61 evas_obj_size_set(w, h),
62 evas_obj_image_fill_set(0, 0, w, h)); 62 evas_obj_image_fill_set(0, 0, w, h));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 7163a1b..d5c8a19 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -25,13 +25,13 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_image_border_set(43, 48, 48, 83), 32 evas_obj_image_border_set(43, 48, 48, 83),
33 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 33 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -56,8 +56,7 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
59 if (o_images[i]) 59 eo_do(o_images[i], evas_obj_position_set(x, y));
60 eo_do(o_images[i], evas_obj_position_set(x, y));
61 } 60 }
62 FPS_STD(NAME); 61 FPS_STD(NAME);
63} 62}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index bec8612..fbe7fb3 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -25,11 +25,11 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 29 evas_obj_image_file_set(build_path("image.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -54,8 +54,7 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
57 if (o_images[i]) 57 eo_do(o_images[i], evas_obj_position_set(x, y));
58 eo_do(o_images[i], evas_obj_position_set(x, y));
59 } 58 }
60 FPS_STD(NAME); 59 FPS_STD(NAME);
61} 60}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 5652e60..fdd56d1 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -25,11 +25,11 @@ static void _setup(void)
25 { 25 {
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 if (o) 28 eo_do(o,
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -54,8 +54,7 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
57 if (o_images[i]) 57 eo_do(o_images[i], evas_obj_position_set(x, y));
58 eo_do(o_images[i], evas_obj_position_set(x, y));
59 } 58 }
60 FPS_STD(NAME); 59 FPS_STD(NAME);
61} 60}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 787e27c..c0f6e2d 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -24,19 +24,19 @@ static void _setup(void)
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 if (o) 27 eo_do(o,
28 eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL), 28 evas_obj_image_file_set(build_path("im1.png"), NULL),
29 evas_obj_image_fill_set(0, 0, 720, 420), 29 evas_obj_image_fill_set(0, 0, 720, 420),
30 evas_obj_size_set(720, 420), 30 evas_obj_size_set(720, 420),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 32
33 o = eo_add(EVAS_IMAGE_CLASS, evas); 33 o = eo_add(EVAS_IMAGE_CLASS, evas);
34 o_images[1] = o; 34 o_images[1] = o;
35 if (o) 35 eo_do(o,
36 eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL), 36 evas_obj_image_file_set(build_path("im2.png"), NULL),
37 evas_obj_image_fill_set(0, 0, 720, 420), 37 evas_obj_image_fill_set(0, 0, 720, 420),
38 evas_obj_size_set(720, 420), 38 evas_obj_size_set(720, 420),
39 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
40 40
41 done = 0; 41 done = 0;
42} 42}
@@ -55,8 +55,7 @@ static void _loop(double t, int f)
55 55
56 a = f & 0x1f; 56 a = f & 0x1f;
57 a = ((a << 3) | (a >> 2)) & 0xff; 57 a = ((a << 3) | (a >> 2)) & 0xff;
58 if (o_images[1]) 58 eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
59 eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
60 FPS_STD(NAME); 59 FPS_STD(NAME);
61} 60}
62 61
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 4383c9d..d868867 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -26,14 +26,14 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
32 evas_obj_image_size_set(640, 480), 32 evas_obj_image_size_set(640, 480),
33 evas_obj_image_alpha_set(0), 33 evas_obj_image_alpha_set(0),
34 evas_obj_image_fill_set(0, 0, 640, 480), 34 evas_obj_image_fill_set(0, 0, 640, 480),
35 evas_obj_size_set(640, 480), 35 evas_obj_size_set(640, 480),
36 evas_obj_visibility_set(EINA_TRUE)); 36 evas_obj_visibility_set(EINA_TRUE));
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
58 h = 480; 58 h = 480;
59 x = (win_w / 2) - (w / 2); 59 x = (win_w / 2) - (w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 if (o_images[i]) 61 eo_do(o_images[i],
62 eo_do(o_images[i], evas_obj_position_set(x, y), 62 evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h), 64 evas_obj_image_fill_set(0, 0, w, h),
65 data = evas_obj_image_data_get(1), 65 data = evas_obj_image_data_get(1),
66 st = evas_obj_image_stride_get()); 66 st = evas_obj_image_stride_get());
67 st = st >> 2; 67 st = st >> 2;
68 p = data; 68 p = data;
69 for (y = 0; y < h; y++) 69 for (y = 0; y < h; y++)
@@ -75,9 +75,9 @@ static void _loop(double t, int f)
75 } 75 }
76 p += (st - w); 76 p += (st - w);
77 } 77 }
78 if (o_images[i]) 78 eo_do(o_images[i],
79 eo_do(o_images[i], evas_obj_image_data_set(data), 79 evas_obj_image_data_set(data),
80 evas_obj_image_data_update_add( 0, 0, w, h)); 80 evas_obj_image_data_update_add( 0, 0, w, h));
81 } 81 }
82 FPS_STD(NAME); 82 FPS_STD(NAME);
83} 83}
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index d0604ca..541eb1b 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -26,14 +26,14 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
32 evas_obj_image_size_set(640, 480), 32 evas_obj_image_size_set(640, 480),
33 evas_obj_image_alpha_set(1), 33 evas_obj_image_alpha_set(1),
34 evas_obj_image_fill_set(0, 0, 640, 480), 34 evas_obj_image_fill_set(0, 0, 640, 480),
35 evas_obj_size_set(640, 480), 35 evas_obj_size_set(640, 480),
36 evas_obj_visibility_set(EINA_TRUE)); 36 evas_obj_visibility_set(EINA_TRUE));
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
58 h = 480; 58 h = 480;
59 x = (win_w / 2) - (w / 2); 59 x = (win_w / 2) - (w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 if (o_images[i]) 61 eo_do(o_images[i],
62 eo_do(o_images[i], evas_obj_position_set(x, y), 62 evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h), 64 evas_obj_image_fill_set(0, 0, w, h),
65 data = evas_obj_image_data_get(1), 65 data = evas_obj_image_data_get(1),
66 st = evas_obj_image_stride_get()); 66 st = evas_obj_image_stride_get());
67 st = st >> 2; 67 st = st >> 2;
68 p = data; 68 p = data;
69 for (y = 0; y < h; y++) 69 for (y = 0; y < h; y++)
@@ -86,9 +86,9 @@ static void _loop(double t, int f)
86 } 86 }
87 p += (st - w); 87 p += (st - w);
88 } 88 }
89 if (o_images[i]) 89 eo_do(o_images[i],
90 eo_do(o_images[i], evas_obj_image_data_set(data), 90 evas_obj_image_data_set(data),
91 evas_obj_image_data_update_add( 0, 0, w, h)); 91 evas_obj_image_data_update_add( 0, 0, w, h));
92 } 92 }
93 FPS_STD(NAME); 93 FPS_STD(NAME);
94} 94}
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index de5232b..d06689a 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -23,30 +23,29 @@ static void _setup(void)
23{ 23{
24 int i, y; 24 int i, y;
25 FILE *f; 25 FILE *f;
26 size_t r;
27 unsigned char **data, **lp; 26 unsigned char **data, **lp;
28 Evas_Object *o; 27 Evas_Object *o;
29 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
30 { 29 {
31 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
32 o_images[i] = o; 31 o_images[i] = o;
33 if (o) 32 eo_do(o,
34 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
35 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
36 evas_obj_image_size_set(640, 480), 35 evas_obj_image_size_set(640, 480),
37 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
38 evas_obj_image_fill_set(0, 0, 640, 480), 37 evas_obj_image_fill_set(0, 0, 640, 480),
39 evas_obj_size_set(640, 480), 38 evas_obj_size_set(640, 480),
40 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
41 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 41 up = malloc(320 * 240);
43 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
44 f = fopen(build_path("tp.yuv"), "rb"); 43 f = fopen(build_path("tp.yuv"), "rb");
45 if (f) 44 if (f)
46 { 45 {
47 r = fread(yp, 640 * 480, 1, f); 46 fread(yp, 640 * 480, 1, f);
48 r = fread(up, 320 * 240, 1, f); 47 fread(up, 320 * 240, 1, f);
49 r = fread(vp, 320 * 240, 1, f); 48 fread(vp, 320 * 240, 1, f);
50 fclose(f); 49 fclose(f);
51 } 50 }
52 data = evas_object_image_data_get(o_images[i], 1); 51 data = evas_object_image_data_get(o_images[i], 1);
@@ -66,8 +65,7 @@ static void _setup(void)
66 *lp = vp + (y * 320); 65 *lp = vp + (y * 320);
67 lp++; 66 lp++;
68 } 67 }
69 if (o_images[i]) 68 eo_do(o_images[i], evas_obj_image_data_set(data));
70 eo_do(o_images[i], evas_obj_image_data_set(data));
71 } 69 }
72 done = 0; 70 done = 0;
73} 71}
@@ -93,11 +91,11 @@ static void _loop(double t, int f)
93 h = 480; 91 h = 480;
94 x = (win_w / 2) - (w / 2); 92 x = (win_w / 2) - (w / 2);
95 y = (win_h / 2) - (h / 2); 93 y = (win_h / 2) - (h / 2);
96 if (o_images[i]) 94 eo_do(o_images[i],
97 eo_do(o_images[i], evas_obj_position_set(x, y), 95 evas_obj_position_set(x, y),
98 evas_obj_size_set(w, h), 96 evas_obj_size_set(w, h),
99 evas_obj_image_fill_set(0, 0, w, h), 97 evas_obj_image_fill_set(0, 0, w, h),
100 evas_obj_image_data_update_add( 0, 0, 640, 480)); 98 evas_obj_image_data_update_add( 0, 0, 640, 480));
101 } 99 }
102 FPS_STD(NAME); 100 FPS_STD(NAME);
103} 101}
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index b018637..dc02971 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -24,30 +24,29 @@ static void _setup(void)
24 int i, y; 24 int i, y;
25 FILE *f; 25 FILE *f;
26 unsigned char **data, **lp; 26 unsigned char **data, **lp;
27 size_t r;
28 Evas_Object *o; 27 Evas_Object *o;
29 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
30 { 29 {
31 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
32 o_images[i] = o; 31 o_images[i] = o;
33 if (o) 32 eo_do(o,
34 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
35 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
36 evas_obj_image_size_set(640, 480), 35 evas_obj_image_size_set(640, 480),
37 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
38 evas_obj_image_fill_set(0, 0, 640, 480), 37 evas_obj_image_fill_set(0, 0, 640, 480),
39 evas_obj_size_set(640, 480), 38 evas_obj_size_set(640, 480),
40 evas_obj_image_smooth_scale_set(0), 39 evas_obj_image_smooth_scale_set(0),
41 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(EINA_TRUE));
42 yp = malloc(640 * 480); 41 yp = malloc(640 * 480);
43 up = malloc(320 * 240); 42 up = malloc(320 * 240);
44 vp = malloc(320 * 240); 43 vp = malloc(320 * 240);
45 f = fopen(build_path("tp.yuv"), "rb"); 44 f = fopen(build_path("tp.yuv"), "rb");
46 if (f) 45 if (f)
47 { 46 {
48 r = fread(yp, 640 * 480, 1, f); 47 fread(yp, 640 * 480, 1, f);
49 r = fread(up, 320 * 240, 1, f); 48 fread(up, 320 * 240, 1, f);
50 r = fread(vp, 320 * 240, 1, f); 49 fread(vp, 320 * 240, 1, f);
51 fclose(f); 50 fclose(f);
52 } 51 }
53 data = evas_object_image_data_get(o_images[i], 1); 52 data = evas_object_image_data_get(o_images[i], 1);
@@ -67,8 +66,7 @@ static void _setup(void)
67 *lp = vp + (y * 320); 66 *lp = vp + (y * 320);
68 lp++; 67 lp++;
69 } 68 }
70 if (o_images[i]) 69 eo_do(o_images[i], evas_obj_image_data_set(data));
71 eo_do(o_images[i], evas_obj_image_data_set(data));
72 } 70 }
73 done = 0; 71 done = 0;
74} 72}
@@ -102,9 +100,9 @@ static void _loop(double t, int f)
102 100
103 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 101 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
104 102
105 if (o_images[i]) 103 eo_do(o_images[i],
106 eo_do(o_images[i], evas_obj_map_enable_set(1), 104 evas_obj_map_enable_set(1),
107 evas_obj_map_set(m)); 105 evas_obj_map_set(m));
108 } 106 }
109 FPS_STD(NAME); 107 FPS_STD(NAME);
110} 108}
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 7ecb470..26a00a1 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -24,29 +24,28 @@ static void _setup(void)
24 int i, y; 24 int i, y;
25 FILE *f; 25 FILE *f;
26 unsigned char **data, **lp; 26 unsigned char **data, **lp;
27 size_t r;
28 Evas_Object *o; 27 Evas_Object *o;
29 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
30 { 29 {
31 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
32 o_images[i] = o; 31 o_images[i] = o;
33 if (o) 32 eo_do(o,
34 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
35 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
36 evas_obj_image_size_set(640, 480), 35 evas_obj_image_size_set(640, 480),
37 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
38 evas_obj_image_fill_set(0, 0, 640, 480), 37 evas_obj_image_fill_set(0, 0, 640, 480),
39 evas_obj_size_set(640, 480), 38 evas_obj_size_set(640, 480),
40 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
41 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 41 up = malloc(320 * 240);
43 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
44 f = fopen(build_path("tp.yuv"), "rb"); 43 f = fopen(build_path("tp.yuv"), "rb");
45 if (f) 44 if (f)
46 { 45 {
47 r = fread(yp, 640 * 480, 1, f); 46 fread(yp, 640 * 480, 1, f);
48 r = fread(up, 320 * 240, 1, f); 47 fread(up, 320 * 240, 1, f);
49 r = fread(vp, 320 * 240, 1, f); 48 fread(vp, 320 * 240, 1, f);
50 fclose(f); 49 fclose(f);
51 } 50 }
52 data = evas_object_image_data_get(o_images[i], 1); 51 data = evas_object_image_data_get(o_images[i], 1);
@@ -66,8 +65,7 @@ static void _setup(void)
66 *lp = vp + (y * 320); 65 *lp = vp + (y * 320);
67 lp++; 66 lp++;
68 } 67 }
69 if (o_images[i]) 68 eo_do(o_images[i], evas_obj_image_data_set(data));
70 eo_do(o_images[i], evas_obj_image_data_set(data));
71 } 69 }
72 done = 0; 70 done = 0;
73} 71}
@@ -100,9 +98,9 @@ static void _loop(double t, int f)
100 98
101 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 99 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
102 100
103 if (o_images[i]) 101 eo_do(o_images[i],
104 eo_do(o_images[i], evas_obj_map_enable_set(1), 102 evas_obj_map_enable_set(1),
105 evas_obj_map_set(m)); 103 evas_obj_map_set(m));
106 } 104 }
107 FPS_STD(NAME); 105 FPS_STD(NAME);
108} 106}
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index b01d894..1025622 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -23,30 +23,29 @@ static void _setup(void)
23{ 23{
24 int i, y; 24 int i, y;
25 FILE *f; 25 FILE *f;
26 size_t r;
27 unsigned char **data, **lp; 26 unsigned char **data, **lp;
28 Evas_Object *o; 27 Evas_Object *o;
29 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
30 { 29 {
31 o = eo_add(EVAS_IMAGE_CLASS, evas); 30 o = eo_add(EVAS_IMAGE_CLASS, evas);
32 o_images[i] = o; 31 o_images[i] = o;
33 if (o) 32 eo_do(o,
34 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
35 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
36 evas_obj_image_size_set(320, 480), 35 evas_obj_image_size_set(320, 480),
37 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
38 evas_obj_image_fill_set(0, 0, 640, 480), 37 evas_obj_image_fill_set(0, 0, 640, 480),
39 evas_obj_size_set(640, 480), 38 evas_obj_size_set(640, 480),
40 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
41 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 41 up = malloc(320 * 240);
43 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
44 f = fopen(build_path("tp.yuv"), "rb"); 43 f = fopen(build_path("tp.yuv"), "rb");
45 if (f) 44 if (f)
46 { 45 {
47 r = fread(yp, 640 * 480, 1, f); 46 fread(yp, 640 * 480, 1, f);
48 r = fread(up, 320 * 240, 1, f); 47 fread(up, 320 * 240, 1, f);
49 r = fread(vp, 320 * 240, 1, f); 48 fread(vp, 320 * 240, 1, f);
50 fclose(f); 49 fclose(f);
51 } 50 }
52 data = evas_object_image_data_get(o_images[i], 1); 51 data = evas_object_image_data_get(o_images[i], 1);
@@ -68,9 +67,9 @@ static void _setup(void)
68 *lp = vp + (y * 320); 67 *lp = vp + (y * 320);
69 lp++; 68 lp++;
70 } 69 }
71 if (o_images[i]) 70 eo_do(o_images[i],
72 eo_do(o_images[i], evas_obj_image_data_set(data), 71 evas_obj_image_data_set(data),
73 evas_obj_image_data_update_add( 0, 0, 320, 480)); 72 evas_obj_image_data_update_add( 0, 0, 320, 480));
74 } 73 }
75 } 74 }
76 done = 0; 75 done = 0;
@@ -99,12 +98,10 @@ static void _loop(double t, int f)
99 h = 480; 98 h = 480;
100 x = (win_w / 2) - (w / 2); 99 x = (win_w / 2) - (w / 2);
101 y = (win_h / 2) - (h / 2); 100 y = (win_h / 2) - (h / 2);
102 if (o_images[i]) 101 eo_do(o_images[i],
103 eo_do(o_images[i], evas_obj_position_set(x, y)); 102 evas_obj_position_set(x, y),
104 if (o_images[i]) 103 evas_obj_size_set(w, h),
105 eo_do(o_images[i], evas_obj_size_set(w, h)); 104 evas_obj_image_fill_set(0, 0, w, h));
106 if (o_images[i])
107 eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
108 105
109 w = 320 - 16 + f; 106 w = 320 - 16 + f;
110 if (w < 1) w = 1; 107 if (w < 1) w = 1;
@@ -112,7 +109,6 @@ static void _loop(double t, int f)
112 109
113 w &= ~0x1; 110 w &= ~0x1;
114 111
115 if (o_images[i])
116 eo_do(o_images[i], evas_obj_image_size_set(w, 480)); 112 eo_do(o_images[i], evas_obj_image_size_set(w, 480));
117 data = evas_object_image_data_get(o_images[i], 1); 113 data = evas_object_image_data_get(o_images[i], 1);
118 if (data) 114 if (data)
@@ -133,10 +129,9 @@ static void _loop(double t, int f)
133 *lp = vp + (y * 320); 129 *lp = vp + (y * 320);
134 lp++; 130 lp++;
135 } 131 }
136 if (o_images[i]) 132 eo_do(o_images[i],
137 eo_do(o_images[i], evas_obj_image_data_set(data)); 133 evas_obj_image_data_set(data),
138 if (o_images[i]) 134 evas_obj_image_data_update_add( 0, 0, w, 480));
139 eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
140 } 135 }
141 } 136 }
142 FPS_STD(NAME); 137 FPS_STD(NAME);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 58207f0..f6aed3a 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 if (o) 60 eo_do(o,
61 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 61 evas_obj_image_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_image_smooth_scale_set(0), 64 evas_obj_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 256, 0); 68 POINT(0, 1, w, -h, -d, 256, 0);
@@ -131,14 +131,15 @@ _cube_pos(Cube *c,
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
132 if (evas_map_util_clockwise_get(m)) 132 if (evas_map_util_clockwise_get(m))
133 { 133 {
134 if (c->side[i].o) 134 eo_do(c->side[i].o,
135 eo_do(c->side[i].o, evas_obj_map_enable_set(1), 135 evas_obj_map_enable_set(1),
136 evas_obj_map_set(m), 136 evas_obj_map_set(m),
137 evas_obj_visibility_set(EINA_TRUE)); 137 evas_obj_visibility_set(EINA_TRUE));
138 } 138 }
139 else 139 else
140 if (c->side[i].o) 140 {
141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
142 }
142 143
143 order[i] = i; 144 order[i] = i;
144 for (j = 0; j < 4; j++) 145 for (j = 0; j < 4; j++)
@@ -162,11 +163,9 @@ _cube_pos(Cube *c,
162 } 163 }
163 while (!sorted); 164 while (!sorted);
164 165
165 if (c->side[order[0]].o) 166 eo_do(c->side[order[0]].o, evas_obj_raise());
166 eo_do(c->side[order[0]].o, evas_obj_raise());
167 for (i = 1; i < 6; i++) 167 for (i = 1; i < 6; i++)
168 if (c->side[order[i]].o) 168 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
169 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
170} 169}
171 170
172static void 171static void
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 75ccdb9..b1e0efe 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -57,11 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 if (o) 60 eo_do(o,
61 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 61 evas_obj_image_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_visibility_set(EINA_TRUE)); 64 evas_obj_visibility_set(EINA_TRUE));
65 } 65 }
66 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
67 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -129,14 +129,15 @@ _cube_pos(Cube *c,
129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
130 if (evas_map_util_clockwise_get(m)) 130 if (evas_map_util_clockwise_get(m))
131 { 131 {
132 if (c->side[i].o) 132 eo_do(c->side[i].o,
133 eo_do(c->side[i].o, evas_obj_map_enable_set(1), 133 evas_obj_map_enable_set(1),
134 evas_obj_map_set(m), 134 evas_obj_map_set(m),
135 evas_obj_visibility_set(EINA_TRUE)); 135 evas_obj_visibility_set(EINA_TRUE));
136 } 136 }
137 else 137 else
138 if (c->side[i].o) 138 {
139 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 139 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
140 }
140 141
141 order[i] = i; 142 order[i] = i;
142 for (j = 0; j < 4; j++) 143 for (j = 0; j < 4; j++)
@@ -160,11 +161,9 @@ _cube_pos(Cube *c,
160 } 161 }
161 while (!sorted); 162 while (!sorted);
162 163
163 if (c->side[order[0]].o) 164 eo_do(c->side[order[0]].o, evas_obj_raise());
164 eo_do(c->side[order[0]].o, evas_obj_raise());
165 for (i = 1; i < 6; i++) 165 for (i = 1; i < 6; i++)
166 if (c->side[order[i]].o) 166 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
167 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
168} 167}
169 168
170static void 169static void
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index bc20ad8..c296818 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 if (o) 60 eo_do(o,
61 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 61 evas_obj_image_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_image_smooth_scale_set(0), 64 evas_obj_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 256, 0); 68 POINT(0, 1, w, -h, -d, 256, 0);
@@ -129,9 +129,9 @@ _cube_pos(Cube *c,
129 255, 255, 255, 129 255, 255, 255,
130 20, 20, 20); 130 20, 20, 20);
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
132 if (c->side[i].o) 132 eo_do(c->side[i].o,
133 eo_do(c->side[i].o, evas_obj_map_enable_set(1), 133 evas_obj_map_enable_set(1),
134 evas_obj_map_set(m)); 134 evas_obj_map_set(m));
135 135
136 order[i] = i; 136 order[i] = i;
137 for (j = 0; j < 4; j++) 137 for (j = 0; j < 4; j++)
@@ -155,11 +155,9 @@ _cube_pos(Cube *c,
155 } 155 }
156 while (!sorted); 156 while (!sorted);
157 157
158 if (c->side[order[0]].o) 158 eo_do(c->side[order[0]].o, evas_obj_raise());
159 eo_do(c->side[order[0]].o, evas_obj_raise());
160 for (i = 1; i < 6; i++) 159 for (i = 1; i < 6; i++)
161 if (c->side[order[i]].o) 160 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
162 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
163} 161}
164 162
165static void 163static void
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index ecce9c2..13547bb 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -57,11 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 if (o) 60 eo_do(o,
61 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 61 evas_obj_image_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_visibility_set(EINA_TRUE)); 64 evas_obj_visibility_set(EINA_TRUE));
65 } 65 }
66 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
67 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -127,8 +127,8 @@ _cube_pos(Cube *c,
127 255, 255, 255, 127 255, 255, 255,
128 20, 20, 20); 128 20, 20, 20);
129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
130 if (c->side[i].o) 130 eo_do(c->side[i].o,
131 eo_do(c->side[i].o, evas_obj_map_enable_set(1), 131 evas_obj_map_enable_set(1),
132 evas_obj_map_set(m)); 132 evas_obj_map_set(m));
133 133
134 order[i] = i; 134 order[i] = i;
@@ -153,11 +153,9 @@ _cube_pos(Cube *c,
153 } 153 }
154 while (!sorted); 154 while (!sorted);
155 155
156 if (c->side[order[0]].o) 156 eo_do(c->side[order[0]].o, evas_obj_raise());
157 eo_do(c->side[order[0]].o, evas_obj_raise());
158 for (i = 1; i < 6; i++) 157 for (i = 1; i < 6; i++)
159 if (c->side[order[i]].o) 158 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
160 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
161} 159}
162 160
163static void 161static void
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 0107588..606eb18 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 if (o) 60 eo_do(o,
61 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 61 evas_obj_image_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 720, 420), 62 evas_obj_image_fill_set(0, 0, 720, 420),
63 evas_obj_size_set(720, 420), 63 evas_obj_size_set(720, 420),
64 evas_obj_image_smooth_scale_set(0), 64 evas_obj_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 720, 0); 68 POINT(0, 1, w, -h, -d, 720, 0);
@@ -131,14 +131,15 @@ _cube_pos(Cube *c,
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
132 if (evas_map_util_clockwise_get(m)) 132 if (evas_map_util_clockwise_get(m))
133 { 133 {
134 if (c->side[i].o) 134 eo_do(c->side[i].o,
135 eo_do(c->side[i].o, evas_obj_map_enable_set(1), 135 evas_obj_map_enable_set(1),
136 evas_obj_map_set(m), 136 evas_obj_map_set(m),
137 evas_obj_visibility_set(EINA_TRUE)); 137 evas_obj_visibility_set(EINA_TRUE));
138 } 138 }
139 else 139 else
140 if (c->side[i].o) 140 {
141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
142 }
142 143
143 order[i] = i; 144 order[i] = i;
144 for (j = 0; j < 4; j++) 145 for (j = 0; j < 4; j++)
@@ -162,11 +163,9 @@ _cube_pos(Cube *c,
162 } 163 }
163 while (!sorted); 164 while (!sorted);
164 165
165 if (c->side[order[0]].o) 166 eo_do(c->side[order[0]].o, evas_obj_raise());
166 eo_do(c->side[order[0]].o, evas_obj_raise());
167 for (i = 1; i < 6; i++) 167 for (i = 1; i < 6; i++)
168 if (c->side[order[i]].o) 168 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
169 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
170} 169}
171 170
172static void 171static void
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index e8b6968..ec4693b 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = eo_add(EVAS_IMAGE_CLASS, evas); 57 o = eo_add(EVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 if (o) 60 eo_do(o,
61 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 61 evas_obj_image_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 720, 420), 62 evas_obj_image_fill_set(0, 0, 720, 420),
63 evas_obj_size_set(720, 420), 63 evas_obj_size_set(720, 420),
64 evas_obj_image_smooth_scale_set(0), 64 evas_obj_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 720, 0); 68 POINT(0, 1, w, -h, -d, 720, 0);
@@ -128,14 +128,15 @@ _cube_pos(Cube *c,
128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
129 if (evas_map_util_clockwise_get(m)) 129 if (evas_map_util_clockwise_get(m))
130 { 130 {
131 if (c->side[i].o) 131 eo_do(c->side[i].o,
132 eo_do(c->side[i].o, evas_obj_map_enable_set(1), 132 evas_obj_map_enable_set(1),
133 evas_obj_map_set(m), 133 evas_obj_map_set(m),
134 evas_obj_visibility_set(EINA_TRUE)); 134 evas_obj_visibility_set(EINA_TRUE));
135 } 135 }
136 else 136 else
137 if (c->side[i].o) 137 {
138 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 138 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
139 }
139 140
140 order[i] = i; 141 order[i] = i;
141 for (j = 0; j < 4; j++) 142 for (j = 0; j < 4; j++)
@@ -159,11 +160,9 @@ _cube_pos(Cube *c,
159 } 160 }
160 while (!sorted); 161 while (!sorted);
161 162
162 if (c->side[order[0]].o) 163 eo_do(c->side[order[0]].o, evas_obj_raise());
163 eo_do(c->side[order[0]].o, evas_obj_raise());
164 for (i = 1; i < 6; i++) 164 for (i = 1; i < 6; i++)
165 if (c->side[order[i]].o) 165 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
166 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
167} 166}
168 167
169static void 168static void
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index ff7ac4b..2f373f4 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -32,22 +32,22 @@ static void _setup(void)
32 o = eo_add(EVAS_IMAGE_CLASS, evas); 32 o = eo_add(EVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 if (o) 35 eo_do(o,
36 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 36 evas_obj_image_file_set(build_path(buf), NULL),
37 evas_obj_image_fill_set(0, 0, 256, 256), 37 evas_obj_image_fill_set(0, 0, 256, 256),
38 evas_obj_size_set(256, 256), 38 evas_obj_size_set(256, 256),
39 evas_obj_image_smooth_scale_set(0), 39 evas_obj_image_smooth_scale_set(0),
40 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(EINA_TRUE));
41 41
42 o = eo_add(EVAS_IMAGE_CLASS, evas); 42 o = eo_add(EVAS_IMAGE_CLASS, evas);
43 o_reflec[i] = o; 43 o_reflec[i] = o;
44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
45 if (o) 45 eo_do(o,
46 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL), 46 evas_obj_image_file_set(build_path(buf), NULL),
47 evas_obj_image_fill_set(0, 0, 256, 256), 47 evas_obj_image_fill_set(0, 0, 256, 256),
48 evas_obj_size_set(256, 256), 48 evas_obj_size_set(256, 256),
49 evas_obj_image_smooth_scale_set(0), 49 evas_obj_image_smooth_scale_set(0),
50 evas_obj_visibility_set(EINA_TRUE)); 50 evas_obj_visibility_set(EINA_TRUE));
51 } 51 }
52 done = 0; 52 done = 0;
53} 53}
@@ -56,8 +56,11 @@ static void _setup(void)
56static void _cleanup(void) 56static void _cleanup(void)
57{ 57{
58 int i; 58 int i;
59 for (i = 0; i < CNUM; i++) eo_del(o_images[i]); 59 for (i = 0; i < CNUM; i++)
60 for (i = 0; i < CNUM; i++) eo_del(o_reflec[i]); 60 {
61 eo_del(o_images[i]);
62 eo_del(o_reflec[i]);
63 }
61} 64}
62 65
63/* loop - do things */ 66/* loop - do things */
@@ -127,17 +130,13 @@ static void _loop(double t, int f)
127 130
128 if (c <= 0) 131 if (c <= 0)
129 { 132 {
130 if (o_images[i]) 133 eo_do(o_images[i], evas_obj_raise());
131 eo_do(o_images[i], evas_obj_raise()); 134 eo_do(o_reflec[i], evas_obj_raise());
132 if (o_reflec[i])
133 eo_do(o_reflec[i], evas_obj_raise());
134 } 135 }
135 else 136 else
136 { 137 {
137 if (o_images[i]) 138 eo_do(o_images[i], evas_obj_lower());
138 eo_do(o_images[i], evas_obj_lower()); 139 eo_do(o_reflec[i], evas_obj_lower());
139 if (o_reflec[i])
140 eo_do(o_reflec[i], evas_obj_lower());
141 } 140 }
142 141
143 evas_map_point_coord_set (m, 0, x, y, -z); 142 evas_map_point_coord_set (m, 0, x, y, -z);
@@ -160,9 +159,9 @@ static void _loop(double t, int f)
160 x + (w / 2), y + (h / 2), 0); 159 x + (w / 2), y + (h / 2), 0);
161 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 160 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
162 161
163 if (o_images[i]) 162 eo_do(o_images[i],
164 eo_do(o_images[i], evas_obj_map_enable_set(1), 163 evas_obj_map_enable_set(1),
165 evas_obj_map_set(m)); 164 evas_obj_map_set(m));
166 165
167 evas_map_point_coord_set (m, 0, x, yy, -z); 166 evas_map_point_coord_set (m, 0, x, yy, -z);
168 evas_map_point_image_uv_set(m, 0, 0, 256); 167 evas_map_point_image_uv_set(m, 0, 0, 256);
@@ -184,8 +183,8 @@ static void _loop(double t, int f)
184 x + (w / 2), y + (h / 2), 0); 183 x + (w / 2), y + (h / 2), 0);
185 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 184 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
186 185
187 if (o_reflec[i]) 186 eo_do(o_reflec[i],
188 eo_do(o_reflec[i], evas_obj_map_enable_set(1), 187 evas_obj_map_enable_set(1),
189 evas_obj_map_set(m)); 188 evas_obj_map_set(m));
190 } 189 }
191 190
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 94641fc..c9dfafb 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 30 evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 evas_obj_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 if (o_images[i]) 72 eo_do(o_images[i],
73 eo_do(o_images[i], evas_obj_map_enable_set(1), 73 evas_obj_map_enable_set(1),
74 evas_obj_map_set(m)); 74 evas_obj_map_set(m));
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 7f2a0b0..e44b31d 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 30 evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 evas_obj_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 if (o_images[i]) 72 eo_do(o_images[i],
73 eo_do(o_images[i], evas_obj_map_enable_set(1), 73 evas_obj_map_enable_set(1),
74 evas_obj_map_set(m)); 74 evas_obj_map_set(m));
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 585063d..20677f2 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 30 evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -67,9 +67,9 @@ static void _loop(double t, int f)
67 67
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 69
70 if (o_images[i]) 70 eo_do(o_images[i],
71 eo_do(o_images[i], evas_obj_map_enable_set(1), 71 evas_obj_map_enable_set(1),
72 evas_obj_map_set(m)); 72 evas_obj_map_set(m));
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index b273b5e..107e663 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 30 evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -66,9 +66,9 @@ static void _loop(double t, int f)
66 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 66 evas_map_point_color_set(m, 3, 0, 0, 0, 0);
67 67
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 if (o_images[i]) 69 eo_do(o_images[i],
70 eo_do(o_images[i], evas_obj_map_enable_set(1), 70 evas_obj_map_enable_set(1),
71 evas_obj_map_set(m)); 71 evas_obj_map_set(m));
72 } 72 }
73 FPS_STD(NAME); 73 FPS_STD(NAME);
74} 74}
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index fe62719..e9dfdcd 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 30 evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 evas_obj_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 if (o_images[i]) 72 eo_do(o_images[i],
73 eo_do(o_images[i], evas_obj_map_enable_set(1), 73 evas_obj_map_enable_set(1),
74 evas_obj_map_set(m)); 74 evas_obj_map_set(m));
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 4811672..0037a9b 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 30 evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 evas_obj_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 if (o_images[i]) 72 eo_do(o_images[i],
73 eo_do(o_images[i], evas_obj_map_enable_set(1), 73 evas_obj_map_enable_set(1),
74 evas_obj_map_set(m)); 74 evas_obj_map_set(m));
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index e5a872f..81ff4ab 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 30 evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -67,9 +67,9 @@ static void _loop(double t, int f)
67 67
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 69
70 if (o_images[i]) 70 eo_do(o_images[i],
71 eo_do(o_images[i], evas_obj_map_enable_set(1), 71 evas_obj_map_enable_set(1),
72 evas_obj_map_set(m)); 72 evas_obj_map_set(m));
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 17ddd33..45e2ed3 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 30 evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -67,9 +67,9 @@ static void _loop(double t, int f)
67 67
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 69
70 if (o_images[i]) 70 eo_do(o_images[i],
71 eo_do(o_images[i], evas_obj_map_enable_set(1), 71 evas_obj_map_enable_set(1),
72 evas_obj_map_set(m)); 72 evas_obj_map_set(m));
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index bc0ec5a..a71fc62 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 30 evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 evas_obj_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -64,9 +64,9 @@ static void _loop(double t, int f)
64 64
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 66
67 if (o_images[i]) 67 eo_do(o_images[i],
68 eo_do(o_images[i], evas_obj_map_enable_set(1), 68 evas_obj_map_enable_set(1),
69 evas_obj_map_set(m)); 69 evas_obj_map_set(m));
70 } 70 }
71 FPS_STD(NAME); 71 FPS_STD(NAME);
72} 72}
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 3cb1eb0..e94f84d 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 30 evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 evas_obj_image_smooth_scale_set(0),
@@ -64,9 +64,9 @@ static void _loop(double t, int f)
64 64
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 66
67 if (o_images[i]) 67 eo_do(o_images[i],
68 eo_do(o_images[i], evas_obj_map_enable_set(1), 68 evas_obj_map_enable_set(1),
69 evas_obj_map_set(m)); 69 evas_obj_map_set(m));
70 } 70 }
71 FPS_STD(NAME); 71 FPS_STD(NAME);
72} 72}
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 7deead8..921522e 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -26,7 +26,6 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o)
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
@@ -62,7 +61,6 @@ static void _loop(double t, int f)
62 61
63 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
64 63
65 if (o_images[i])
66 eo_do(o_images[i], evas_obj_map_enable_set(1), 64 eo_do(o_images[i], evas_obj_map_enable_set(1),
67 evas_obj_map_set(m)); 65 evas_obj_map_set(m));
68 } 66 }
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 4ac2552..d9b61bb 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o) 29 eo_do(o,
30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL), 30 evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -62,9 +62,9 @@ static void _loop(double t, int f)
62 62
63 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 63 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
64 64
65 if (o_images[i]) 65 eo_do(o_images[i],
66 eo_do(o_images[i], evas_obj_map_enable_set(1), 66 evas_obj_map_enable_set(1),
67 evas_obj_map_set(m)); 67 evas_obj_map_set(m));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index f5dadce..ba21f73 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -26,7 +26,6 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (o)
30 eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL), 29 eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 640, 480), 30 evas_obj_image_fill_set(0, 0, 640, 480),
32 evas_obj_size_set(640, 480), 31 evas_obj_size_set(640, 480),
@@ -55,7 +54,6 @@ static void _loop(double t, int f)
55 h *= (f / 100.0) * 4.0; 54 h *= (f / 100.0) * 4.0;
56 x = (win_w / 2) - (w / 2); 55 x = (win_w / 2) - (w / 2);
57 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
58 if (o_images[i])
59 eo_do(o_images[i], evas_obj_position_set(x, y), 57 eo_do(o_images[i], evas_obj_position_set(x, y),
60 evas_obj_size_set(w, h), 58 evas_obj_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 59 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 600a5d4..e61d721 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o,*src; 23 Evas_Object *o,*src;
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 if (o) 26 eo_do(o,
27 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 27 evas_obj_image_file_set(build_path("logo.png"), NULL),
28 evas_obj_image_fill_set(0, 0, 120, 160), 28 evas_obj_image_fill_set(0, 0, 120, 160),
29 evas_obj_size_set(120, 160), 29 evas_obj_size_set(120, 160),
30 evas_obj_visibility_set(EINA_TRUE)); 30 evas_obj_visibility_set(EINA_TRUE));
31 src = o; 31 src = o;
32 o_images[0] = src; 32 o_images[0] = src;
33 33
@@ -35,11 +35,11 @@ static void _setup(void)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, evas); 36 o = eo_add(EVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 if (o) 38 eo_do(o,
39 eo_do(o, evas_obj_image_source_set(src), 39 evas_obj_image_source_set(src),
40 evas_obj_size_set(120, 160), 40 evas_obj_size_set(120, 160),
41 evas_obj_image_fill_set(0,0,120,160), 41 evas_obj_image_fill_set(0,0,120,160),
42 evas_obj_visibility_set(EINA_TRUE)); 42 evas_obj_visibility_set(EINA_TRUE));
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -64,8 +64,7 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 if (o_images[i]) 67 eo_do(o_images[i], evas_obj_position_set(x, y));
68 eo_do(o_images[i], evas_obj_position_set(x, y));
69 } 68 }
70 FPS_STD(NAME); 69 FPS_STD(NAME);
71} 70}
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index ee53d8e..0585c06 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -27,22 +27,20 @@ static void _setup(void)
27 Evas_Object *o,*src; 27 Evas_Object *o,*src;
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, evas); 29 o = eo_add(EVAS_IMAGE_CLASS, evas);
30 if (o) 30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_size_set(120, 160), 33 evas_obj_position_set(-400, -300));
34 evas_obj_position_set(-400, -300));
35 src = o; 34 src = o;
36 35
37 for (i = 0; i < OBNUM / 2; i++) 36 for (i = 0; i < OBNUM / 2; i++)
38 { 37 {
39 o = eo_add(EVAS_IMAGE_CLASS, evas); 38 o = eo_add(EVAS_IMAGE_CLASS, evas);
40 o_images[i] = o; 39 o_images[i] = o;
41 if (o) 40 eo_do(o, evas_obj_image_source_set(src, NULL),
42 eo_do(o, evas_obj_image_source_set(src, NULL), 41 evas_obj_size_set(120, 160),
43 evas_obj_size_set(120, 160), 42 evas_obj_image_fill_set(0,0,120,160),
44 evas_obj_image_fill_set(0,0,120,160), 43 evas_obj_visibility_set(EINA_TRUE));
45 evas_obj_visibility_set(EINA_TRUE));
46 } 44 }
47 done = 0; 45 done = 0;
48} 46}
@@ -67,7 +65,6 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 if (o_images[i])
71 eo_do(o_images[i], evas_obj_position_set(x, y)); 68 eo_do(o_images[i], evas_obj_position_set(x, y));
72 } 69 }
73 FPS_STD(NAME); 70 FPS_STD(NAME);
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 7da5711..073202d 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -29,16 +29,16 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 if (o) 32 eo_do(o,
33 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), 33 evas_obj_text_font_set("Vera-Bold", 20),
34 evas_obj_text_set("This is a test string"), 34 evas_obj_text_set("This is a test string"),
35 evas_obj_text_style_set(st), 35 evas_obj_text_style_set(st),
36 evas_obj_color_set(255, 255, 255, 255), 36 evas_obj_color_set(255, 255, 255, 255),
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_shadow_color_set(0, 0, 0, 24),
38 evas_obj_text_glow_color_set(100, 80, 40, 100), 38 evas_obj_text_glow_color_set(100, 80, 40, 100),
39 evas_obj_text_glow2_color_set(50, 10, 5, 50), 39 evas_obj_text_glow2_color_set(50, 10, 5, 50),
40 evas_obj_text_outline_color_set(0, 0, 0, 255), 40 evas_obj_text_outline_color_set(0, 0, 0, 255),
41 evas_obj_visibility_set(EINA_TRUE)); 41 evas_obj_visibility_set(EINA_TRUE));
42 st++; 42 st++;
43 } 43 }
44 st = i; 44 st = i;
@@ -48,15 +48,13 @@ static void _setup(void)
48 s = o_texts[i % st]; 48 s = o_texts[i % st];
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_texts[i] = o; 50 o_texts[i] = o;
51 if (o) 51 eo_do(o, evas_obj_image_source_set(s));
52 eo_do(o, evas_obj_image_source_set(s));
53 /* FIXME s == NULL*/ 52 /* FIXME s == NULL*/
54 if (s) 53 eo_do(s, evas_obj_size_get(&w, &h));
55 eo_do(s, evas_obj_size_get(&w, &h)); 54 eo_do(o,
56 if (o) 55 evas_obj_size_set(w, h),
57 eo_do(o, evas_obj_size_set(w, h), 56 evas_obj_image_fill_set(0, 0, w, h),
58 evas_obj_image_fill_set(0, 0, w, h), 57 evas_obj_visibility_set(EINA_TRUE));
59 evas_obj_visibility_set(EINA_TRUE));
60 } 58 }
61 59
62 done = 0; 60 done = 0;
@@ -76,13 +74,11 @@ static void _loop(double t, int f)
76 Evas_Coord x, y, w, h; 74 Evas_Coord x, y, w, h;
77 for (i = 0; i < OBNUM; i++) 75 for (i = 0; i < OBNUM; i++)
78 { 76 {
79 if (o_texts[i])
80 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 77 eo_do(o_texts[i], evas_obj_size_get(&w, &h));
81 x = (win_w / 2) - (w / 2); 78 x = (win_w / 2) - (w / 2);
82 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
83 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
84 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
85 if (o_texts[i])
86 eo_do(o_texts[i], evas_obj_position_set(x, y)); 82 eo_do(o_texts[i], evas_obj_position_set(x, y));
87 } 83 }
88 FPS_STD(NAME); 84 FPS_STD(NAME);
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 2dde775..6822963 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -32,43 +32,37 @@ static void _setup(void)
32 srnd(); 32 srnd();
33 o = eo_add(EVAS_TEXT_CLASS, evas); 33 o = eo_add(EVAS_TEXT_CLASS, evas);
34 o_texts[0] = o; 34 o_texts[0] = o;
35 if (o)
36 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
37 snprintf(buf, sizeof(buf), "%s %s %s %s.", 35 snprintf(buf, sizeof(buf), "%s %s %s %s.",
38 strs[rnd() % (sizeof(strs) / sizeof(char *))], 36 strs[rnd() % (sizeof(strs) / sizeof(char *))],
39 strs[rnd() % (sizeof(strs) / sizeof(char *))], 37 strs[rnd() % (sizeof(strs) / sizeof(char *))],
40 strs[rnd() % (sizeof(strs) / sizeof(char *))], 38 strs[rnd() % (sizeof(strs) / sizeof(char *))],
41 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 39 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
42 if (o) 40
43 eo_do(o, evas_obj_text_set(buf)); 41 eo_do(o,
44 if (o) 42 evas_obj_text_font_set("Vera-Bold", 20),
45 eo_do(o, evas_obj_color_set(0, 0, 0, 255)); 43 evas_obj_text_set(buf),
46 if (o) 44 evas_obj_color_set(0, 0, 0, 255),
47 eo_do(o, evas_obj_size_get(&w, &h)); 45 evas_obj_size_get(&w, &h));
48 x = (win_w / 2) - (w / 2); 46 x = (win_w / 2) - (w / 2);
49 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
50 y = (win_h / 2) - (h / 2); 48 y = (win_h / 2) - (h / 2);
51 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
52 if (o) 50 eo_do(o,
53 eo_do(o, evas_obj_position_set(x, y)); 51 evas_obj_position_set(x, y),
54 if (o) 52 evas_obj_visibility_set(EINA_TRUE));
55 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
56 for (i = 1 ; i < OBNUM ; i ++) 53 for (i = 1 ; i < OBNUM ; i ++)
57 { 54 {
58 o = eo_add(EVAS_IMAGE_CLASS, evas); 55 o = eo_add(EVAS_IMAGE_CLASS, evas);
59 o_texts[i] = o; 56 o_texts[i] = o;
60 if (o) 57 eo_do(o,
61 eo_do(o, evas_obj_image_source_set(o_texts[0])); 58 evas_obj_image_source_set(o_texts[0]));
62 if (o_texts[0])
63 eo_do(o_texts[0], evas_obj_size_get(&w, &h)); 59 eo_do(o_texts[0], evas_obj_size_get(&w, &h));
64 if (o)
65 eo_do(o, evas_obj_size_set(w, h), 60 eo_do(o, evas_obj_size_set(w, h),
66 evas_obj_image_fill_set(0, 0, w, h)); 61 evas_obj_image_fill_set(0, 0, w, h));
67 x = (win_w / 2) - (w / 2); 62 x = (win_w / 2) - (w / 2);
68 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 63 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
69 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
70 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 65 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
71 if (o)
72 eo_do(o, evas_obj_position_set(x, y), 66 eo_do(o, evas_obj_position_set(x, y),
73 evas_obj_visibility_set(EINA_TRUE)); 67 evas_obj_visibility_set(EINA_TRUE));
74 } 68 }
@@ -90,24 +84,22 @@ static void _loop(double t, int f)
90 char buf[1024]; 84 char buf[1024];
91 const char *strs[] = { 85 const char *strs[] = {
92 "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I", 86 "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I",
93 "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy", 87 "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
94 "Fiddly", "Family", "Lair", "Monkeys", "Magazine" 88 "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
95 }; 89 };
96 snprintf(buf, sizeof(buf), "%s %s %s %s.", 90 snprintf(buf, sizeof(buf), "%s %s %s %s.",
97 strs[rnd() % (sizeof(strs) / sizeof(char *))], 91 strs[rnd() % (sizeof(strs) / sizeof(char *))],
98 strs[rnd() % (sizeof(strs) / sizeof(char *))], 92 strs[rnd() % (sizeof(strs) / sizeof(char *))],
99 strs[rnd() % (sizeof(strs) / sizeof(char *))], 93 strs[rnd() % (sizeof(strs) / sizeof(char *))],
100 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 94 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
101 if (o_texts[0]) 95 eo_do(o_texts[0],
102 eo_do(o_texts[0], evas_obj_text_set(buf)); 96 evas_obj_text_set(buf),
103 if (o_texts[0]) 97 evas_obj_size_get(&w, &h));
104 eo_do(o_texts[0], evas_obj_size_get(&w, &h));
105 for (i = 1; i < OBNUM; i++) 98 for (i = 1; i < OBNUM; i++)
106 { 99 {
107 if (o_texts[i]) 100 eo_do(o_texts[i],
108 eo_do(o_texts[i], evas_obj_size_set(w,h)); 101 evas_obj_size_set(w,h),
109 if (o_texts[i]) 102 evas_obj_image_fill_set(0,0,w,h));
110 eo_do(o_texts[i], evas_obj_image_fill_set(0,0,w,h));
111 } 103 }
112 FPS_STD(NAME); 104 FPS_STD(NAME);
113} 105}
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index d7cc901..2a24694 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -32,9 +32,9 @@ static void _setup(void)
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 if (o) 35 eo_do(o,
36 eo_do(o, evas_obj_color_set(r, g, b, a), 36 evas_obj_color_set(r, g, b, a),
37 evas_obj_visibility_set(EINA_TRUE)); 37 evas_obj_visibility_set(EINA_TRUE));
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -61,9 +61,9 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 y = (win_h / 2) - (h / 2); 62 y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 if (o_images[i]) 64 eo_do(o_images[i],
65 eo_do(o_images[i], evas_obj_position_set(x, y), 65 evas_obj_position_set(x, y),
66 evas_obj_size_set(w, h)); 66 evas_obj_size_set(w, h));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 11b4281..15985b4 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -35,7 +35,6 @@ static void _setup(void)
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 g = ((rnd()&0xff) * a) / 255;
37 b = ((rnd()&0xff) * a) / 255; 37 b = ((rnd()&0xff) * a) / 255;
38 if (o)
39 eo_do(o, evas_obj_color_set(r, g, b, a), 38 eo_do(o, evas_obj_color_set(r, g, b, a),
40 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
41 } 40 }
@@ -64,7 +63,6 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
65 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
67 if (o_images[i])
68 eo_do(o_images[i], evas_obj_position_set(x, y), 66 eo_do(o_images[i], evas_obj_position_set(x, y),
69 evas_obj_size_set(w, h)); 67 evas_obj_size_set(w, h));
70 } 68 }
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 325f717..f4df639 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -33,9 +33,9 @@ static void _setup(void)
33 r = ((rnd()&0xff) * a) / 255; 33 r = ((rnd()&0xff) * a) / 255;
34 g = ((rnd()&0xff) * a) / 255; 34 g = ((rnd()&0xff) * a) / 255;
35 b = ((rnd()&0xff) * a) / 255; 35 b = ((rnd()&0xff) * a) / 255;
36 if (o) 36 eo_do(o,
37 eo_do(o, evas_obj_color_set(r, g, b, a), 37 evas_obj_color_set(r, g, b, a),
38 evas_obj_visibility_set(EINA_TRUE)); 38 evas_obj_visibility_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -62,9 +62,9 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
65 if (o_images[i]) 65 eo_do(o_images[i],
66 eo_do(o_images[i], evas_obj_position_set(x, y), 66 evas_obj_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 evas_obj_size_set(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index db23e26..465bd82 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -36,7 +36,6 @@ static void _setup(void)
36 r = ((rnd()&0xff) * a) / 255; 36 r = ((rnd()&0xff) * a) / 255;
37 g = ((rnd()&0xff) * a) / 255; 37 g = ((rnd()&0xff) * a) / 255;
38 b = ((rnd()&0xff) * a) / 255; 38 b = ((rnd()&0xff) * a) / 255;
39 if (o)
40 eo_do(o, evas_obj_color_set(r, g, b, a), 39 eo_do(o, evas_obj_color_set(r, g, b, a),
41 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(EINA_TRUE));
42 } 41 }
@@ -65,7 +64,6 @@ static void _loop(double t, int f)
65 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
66 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
67 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
68 if (o_images[i])
69 eo_do(o_images[i], evas_obj_position_set(x, y), 67 eo_do(o_images[i], evas_obj_position_set(x, y),
70 evas_obj_size_set(w, h)); 68 evas_obj_size_set(w, h));
71 } 69 }
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index aa1305d..071bdf4 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -32,9 +32,9 @@ static void _setup(void)
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 if (o) 35 eo_do(o,
36 eo_do(o, evas_obj_color_set(r, g, b, a), 36 evas_obj_color_set(r, g, b, a),
37 evas_obj_visibility_set(EINA_TRUE)); 37 evas_obj_visibility_set(EINA_TRUE));
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -61,9 +61,9 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 y = (win_h / 2) - (h / 2); 62 y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 if (o_images[i]) 64 eo_do(o_images[i],
65 eo_do(o_images[i], evas_obj_position_set(x, y), 65 evas_obj_position_set(x, y),
66 evas_obj_size_set(w, h)); 66 evas_obj_size_set(w, h));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 8e4227d..917a96c 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -35,7 +35,6 @@ static void _setup(void)
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 g = ((rnd()&0xff) * a) / 255;
37 b = ((rnd()&0xff) * a) / 255; 37 b = ((rnd()&0xff) * a) / 255;
38 if (o)
39 eo_do(o, evas_obj_color_set(r, g, b, a), 38 eo_do(o, evas_obj_color_set(r, g, b, a),
40 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
41 } 40 }
@@ -64,7 +63,6 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
65 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
67 if (o_images[i])
68 eo_do(o_images[i], evas_obj_position_set(x, y), 66 eo_do(o_images[i], evas_obj_position_set(x, y),
69 evas_obj_size_set(w, h)); 67 evas_obj_size_set(w, h));
70 } 68 }
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index c7ecb97..b331d6f 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -25,13 +25,12 @@ static void _setup(void)
25 25
26 for (i = 0; i < OBNUM; i++) 26 for (i = 0; i < OBNUM; i++)
27 { 27 {
28 o = eo_add(EVAS_TEXT_CLASS, evas); 28 o = eo_add(EVAS_TEXT_CLASS, evas);
29 o_texts[i] = o; 29 o_texts[i] = o;
30 if (o) 30 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
31 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), 31 evas_obj_text_set("This is a test string"),
32 evas_obj_text_set("This is a test string"), 32 evas_obj_color_set(0, 0, 0, 255),
33 evas_obj_color_set(0, 0, 0, 255), 33 evas_obj_visibility_set(EINA_TRUE));
34 evas_obj_visibility_set(EINA_TRUE));
35 } 34 }
36 done = 0; 35 done = 0;
37} 36}
@@ -50,14 +49,12 @@ static void _loop(double t, int f)
50 Evas_Coord x, y, w, h; 49 Evas_Coord x, y, w, h;
51 for (i = 0; i < OBNUM; i++) 50 for (i = 0; i < OBNUM; i++)
52 { 51 {
53 if (o_texts[i]) 52 eo_do(o_texts[i], evas_obj_size_get(&w, &h));
54 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 53 x = (win_w / 2) - (w / 2);
55 x = (win_w / 2) - (w / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 55 y = (win_h / 2) - (h / 2);
57 y = (win_h / 2) - (h / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 57 eo_do(o_texts[i], evas_obj_position_set(x, y));
59 if (o_texts[i])
60 eo_do(o_texts[i], evas_obj_position_set(x, y));
61 } 58 }
62 FPS_STD(NAME); 59 FPS_STD(NAME);
63} 60}
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 3114931..fe725a7 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,14 +34,12 @@ static void _setup(void)
34 { 34 {
35 o = eo_add(EVAS_TEXT_CLASS, evas); 35 o = eo_add(EVAS_TEXT_CLASS, evas);
36 o_texts[i] = o; 36 o_texts[i] = o;
37 if (o)
38 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20)); 37 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
39 snprintf(buf, sizeof(buf), "%s %s %s %s.", 38 snprintf(buf, sizeof(buf), "%s %s %s %s.",
40 strs[rnd() % (sizeof(strs) / sizeof(char *))], 39 strs[rnd() % (sizeof(strs) / sizeof(char *))],
41 strs[rnd() % (sizeof(strs) / sizeof(char *))], 40 strs[rnd() % (sizeof(strs) / sizeof(char *))],
42 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
43 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 42 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
44 if (o)
45 eo_do(o, evas_obj_text_set(buf), 43 eo_do(o, evas_obj_text_set(buf),
46 evas_obj_color_set(0, 0, 0, 255), 44 evas_obj_color_set(0, 0, 0, 255),
47 evas_obj_size_get(&w, &h)); 45 evas_obj_size_get(&w, &h));
@@ -49,7 +47,6 @@ static void _setup(void)
49 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
50 y = (win_h / 2) - (h / 2); 48 y = (win_h / 2) - (h / 2);
51 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
52 if (o)
53 eo_do(o, evas_obj_position_set(x, y), 50 eo_do(o, evas_obj_position_set(x, y),
54 evas_obj_visibility_set(EINA_TRUE)); 51 evas_obj_visibility_set(EINA_TRUE));
55 } 52 }
@@ -80,7 +77,6 @@ static void _loop(double t, int f)
80 strs[rnd() % (sizeof(strs) / sizeof(char *))], 77 strs[rnd() % (sizeof(strs) / sizeof(char *))],
81 strs[rnd() % (sizeof(strs) / sizeof(char *))], 78 strs[rnd() % (sizeof(strs) / sizeof(char *))],
82 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 79 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
83 if (o_texts[i])
84 eo_do(o_texts[i], evas_obj_text_set(buf)); 80 eo_do(o_texts[i], evas_obj_text_set(buf));
85 } 81 }
86 FPS_STD(NAME); 82 FPS_STD(NAME);
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 5833efd..ad893fc 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -29,16 +29,16 @@ static void _setup(void)
29 { 29 {
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 if (o) 32 eo_do(o,
33 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), 33 evas_obj_text_font_set("Vera-Bold", 20),
34 evas_obj_text_set("This is a test string"), 34 evas_obj_text_set("This is a test string"),
35 evas_obj_text_style_set(st), 35 evas_obj_text_style_set(st),
36 evas_obj_color_set(255, 255, 255, 255), 36 evas_obj_color_set(255, 255, 255, 255),
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_shadow_color_set(0, 0, 0, 24),
38 evas_obj_text_glow_color_set(100, 80, 40, 100), 38 evas_obj_text_glow_color_set(100, 80, 40, 100),
39 evas_obj_text_glow2_color_set(50, 10, 5, 50), 39 evas_obj_text_glow2_color_set(50, 10, 5, 50),
40 evas_obj_text_outline_color_set(0, 0, 0, 255), 40 evas_obj_text_outline_color_set(0, 0, 0, 255),
41 evas_obj_visibility_set(EINA_TRUE)); 41 evas_obj_visibility_set(EINA_TRUE));
42 st++; 42 st++;
43 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 43 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
44 } 44 }
@@ -59,14 +59,12 @@ static void _loop(double t, int f)
59 Evas_Coord x, y, w, h; 59 Evas_Coord x, y, w, h;
60 for (i = 0; i < OBNUM; i++) 60 for (i = 0; i < OBNUM; i++)
61 { 61 {
62 if (o_texts[i]) 62 eo_do(o_texts[i], evas_obj_size_get(&w, &h));
63 eo_do(o_texts[i], evas_obj_size_get(&w, &h));
64 x = (win_w / 2) - (w / 2); 63 x = (win_w / 2) - (w / 2);
65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
66 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
68 if (o_texts[i]) 67 eo_do(o_texts[i], evas_obj_position_set(x, y));
69 eo_do(o_texts[i], evas_obj_position_set(x, y));
70 } 68 }
71 FPS_STD(NAME); 69 FPS_STD(NAME);
72} 70}
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 0ccf9bc..6eb16ca 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,14 +36,12 @@ static void _setup(void)
36 { 36 {
37 o = eo_add(EVAS_TEXT_CLASS, evas); 37 o = eo_add(EVAS_TEXT_CLASS, evas);
38 o_texts[i] = o; 38 o_texts[i] = o;
39 if (o)
40 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20)); 39 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
41 snprintf(buf, sizeof(buf), "%s %s %s %s.", 40 snprintf(buf, sizeof(buf), "%s %s %s %s.",
42 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
43 strs[rnd() % (sizeof(strs) / sizeof(char *))], 42 strs[rnd() % (sizeof(strs) / sizeof(char *))],
44 strs[rnd() % (sizeof(strs) / sizeof(char *))], 43 strs[rnd() % (sizeof(strs) / sizeof(char *))],
45 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 44 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
46 if (o)
47 eo_do(o, evas_obj_text_set(buf), 45 eo_do(o, evas_obj_text_set(buf),
48 evas_obj_text_style_set(st), 46 evas_obj_text_style_set(st),
49 evas_obj_color_set(255, 255, 255, 255), 47 evas_obj_color_set(255, 255, 255, 255),
@@ -72,13 +70,11 @@ static void _loop(double t, int f)
72 Evas_Coord x, y, w, h; 70 Evas_Coord x, y, w, h;
73 for (i = 0; i < OBNUM; i++) 71 for (i = 0; i < OBNUM; i++)
74 { 72 {
75 if (o_texts[i])
76 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 73 eo_do(o_texts[i], evas_obj_size_get(&w, &h));
77 x = (win_w / 2) - (w / 2); 74 x = (win_w / 2) - (w / 2);
78 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
79 y = (win_h / 2) - (h / 2); 76 y = (win_h / 2) - (h / 2);
80 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
81 if (o_texts[i])
82 eo_do(o_texts[i], evas_obj_position_set(x, y)); 78 eo_do(o_texts[i], evas_obj_position_set(x, y));
83 } 79 }
84 FPS_STD(NAME); 80 FPS_STD(NAME);
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index 0824f2a..c0ec4ce 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -30,14 +30,10 @@ static void _setup(void)
30 (st, 30 (st,
31 "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'" 31 "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
32 ); 32 );
33 if (o) 33 eo_do(o,
34 eo_do(o, evas_obj_textblock_style_set(st)); 34 evas_obj_textblock_style_set(st),
35 evas_textblock_style_free(st); 35 evas_obj_textblock_clear(),
36 if (o) 36 evas_obj_textblock_text_markup_set(
37 eo_do(o, evas_obj_textblock_clear());
38
39 if (o)
40 eo_do(o, evas_obj_textblock_text_markup_set(
41 "This is a test of auto alignment in Evas<ps/>" 37 "This is a test of auto alignment in Evas<ps/>"
42 "<br/>" 38 "<br/>"
43 "This text should be left aligned<ps/>" 39 "This text should be left aligned<ps/>"
@@ -55,10 +51,9 @@ static void _setup(void)
55 "words should appear in the following order: 'דוגמה' first, 'of' second,<br/>" 51 "words should appear in the following order: 'דוגמה' first, 'of' second,<br/>"
56 "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps/>" 52 "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps/>"
57 "דוגמה of טקסט in english." 53 "דוגמה of טקסט in english."
58 )); 54 ),
59 55 evas_obj_visibility_set(EINA_TRUE));
60 if (o) 56 evas_textblock_style_free(st);
61 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
62 57
63 done = 0; 58 done = 0;
64} 59}
@@ -75,17 +70,15 @@ static void _loop(double t, int f)
75 Evas_Coord x, y, w, h, w0, h0; 70 Evas_Coord x, y, w, h, w0, h0;
76 int i = 0; 71 int i = 0;
77 72
78 if (o_text) 73 eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
79 eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
80 w = w0; 74 w = w0;
81 h = h0; 75 h = h0;
82 w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0); 76 w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
83 x = (win_w / 2) - (w / 2); 77 x = (win_w / 2) - (w / 2);
84 y = (win_h / 2) - (h0 / 2); 78 y = (win_h / 2) - (h0 / 2);
85 if (o_text) 79 eo_do(o_text,
86 eo_do(o_text, evas_obj_position_set(x, y)); 80 evas_obj_position_set(x, y),
87 if (o_text) 81 evas_obj_size_set(w, h));
88 eo_do(o_text, evas_obj_size_set(w, h));
89 82
90 FPS_STD(NAME); 83 FPS_STD(NAME);
91} 84}
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 29b964c..c3841c8 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -39,14 +39,10 @@ static void _setup(void)
39 "p='+ font=Vera,Kochi font_size=10 align=left'" 39 "p='+ font=Vera,Kochi font_size=10 align=left'"
40 "/p='- \n'" 40 "/p='- \n'"
41 ); 41 );
42 if (o) 42 eo_do(o,
43 eo_do(o, evas_obj_textblock_style_set(st)); 43 evas_obj_textblock_style_set(st),
44 evas_textblock_style_free(st); 44 evas_obj_textblock_clear(),
45 if (o) 45 evas_obj_textblock_text_markup_set(
46 eo_do(o, evas_obj_textblock_clear());
47
48 if (o)
49 eo_do(o, evas_obj_textblock_text_markup_set(
50 "<center><h1>Title</h1></center><br/>" 46 "<center><h1>Title</h1></center><br/>"
51 "<p><tab>A pragraph here <red>red text</red> and stuff.</p>" 47 "<p><tab>A pragraph here <red>red text</red> and stuff.</p>"
52 "<p>And escaping &lt; and &gt; as well as &amp; as <h1>normal.</h1></p>" 48 "<p>And escaping &lt; and &gt; as well as &amp; as <h1>normal.</h1></p>"
@@ -115,10 +111,10 @@ static void _setup(void)
115 "Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu l'âme " 111 "Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu l'âme "
116 "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim" 112 "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim"
117 "</blockquote>" 113 "</blockquote>"
118 )); 114 ),
115 evas_obj_visibility_set(EINA_TRUE));
119 116
120 if (o) 117 evas_textblock_style_free(st);
121 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
122 118
123 done = 0; 119 done = 0;
124} 120}
@@ -143,10 +139,9 @@ static void _loop(double t, int f)
143 x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2); 139 x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2);
144 y = (win_h / 2) - (h / 2); 140 y = (win_h / 2) - (h / 2);
145 y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2); 141 y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
146 if (o_text) 142 eo_do(o_text,
147 eo_do(o_text, evas_obj_position_set(x, y)); 143 evas_obj_position_set(x, y),
148 if (o_text) 144 evas_obj_size_set(w, 5000));
149 eo_do(o_text, evas_obj_size_set(w, 5000));
150 145
151 FPS_STD(NAME); 146 FPS_STD(NAME);
152} 147}
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 63301ed..7559599 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -30,14 +30,10 @@ static void _setup(void)
30 (st, 30 (st,
31 "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'" 31 "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'"
32 ); 32 );
33 if (o) 33 eo_do(o,
34 eo_do(o, evas_obj_textblock_style_set(st)); 34 evas_obj_textblock_style_set(st),
35 evas_textblock_style_free(st); 35 evas_obj_textblock_clear(),
36 if (o) 36 evas_obj_textblock_text_markup_set(
37 eo_do(o, evas_obj_textblock_clear());
38
39 if (o)
40 eo_do(o, evas_obj_textblock_text_markup_set(
41 "This is a test of International test rendering in Evas<br/>" 37 "This is a test of International test rendering in Evas<br/>"
42 "<br/>" 38 "<br/>"
43 "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'<br/>" 39 "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'<br/>"
@@ -86,10 +82,10 @@ static void _setup(void)
86 "Thai: 'ยูนืโคด'<br/>" 82 "Thai: 'ยูนืโคด'<br/>"
87 "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'<br/>" 83 "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'<br/>"
88 "Yiddish: 'יוניקאָד'<br/>" 84 "Yiddish: 'יוניקאָד'<br/>"
89 )); 85 ),
86 evas_obj_visibility_set(EINA_TRUE));
90 87
91 if (o) 88 evas_textblock_style_free(st);
92 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
93 89
94 done = 0; 90 done = 0;
95} 91}
@@ -106,18 +102,16 @@ static void _loop(double t, int f)
106 Evas_Coord x, y, w, h, w0, h0; 102 Evas_Coord x, y, w, h, w0, h0;
107 int i = 0; 103 int i = 0;
108 104
109 if (o_text)