summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.goldberg@gmail.com>2013-01-23 15:05:09 +0000
committerYakov Goldberg <yakov.goldberg@gmail.com>2013-01-23 15:05:09 +0000
commitfaf1579d35c232607a0bfa39b33a185071e843ed (patch)
tree9bce93c3e50c6b842fe0165ec1fa9f801db4d04d
parent42339e1e323b23382e84b5ff781ec8565edeaba8 (diff)
expedite: porting to Eo
Signed-off-by: Yakov Goldberg <yakov.goldberg@gmail.com> SVN revision: 83180
-rw-r--r--src/bin/about.c23
-rw-r--r--src/bin/filter_object_blur.c22
-rw-r--r--src/bin/filter_object_blur_solid.c24
-rw-r--r--src/bin/filter_object_brightness.c22
-rw-r--r--src/bin/filter_object_brightness_solid.c26
-rw-r--r--src/bin/filter_object_colors.c14
-rw-r--r--src/bin/filter_object_colors_solid.c16
-rw-r--r--src/bin/filter_object_greyscale.c20
-rw-r--r--src/bin/filter_object_greyscale_solid.c22
-rw-r--r--src/bin/filter_object_invert.c20
-rw-r--r--src/bin/filter_object_invert_solid.c22
-rw-r--r--src/bin/filter_object_sepia.c20
-rw-r--r--src/bin/filter_object_sepia_solid.c22
-rw-r--r--src/bin/image_blend_border.c32
-rw-r--r--src/bin/image_blend_border_recolor.c34
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c30
-rw-r--r--src/bin/image_blend_fade_unscaled.c29
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c32
-rw-r--r--src/bin/image_blend_nearest_scaled.c32
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c32
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c32
-rw-r--r--src/bin/image_blend_occlude1.c54
-rw-r--r--src/bin/image_blend_occlude1_few.c54
-rw-r--r--src/bin/image_blend_occlude1_many.c54
-rw-r--r--src/bin/image_blend_occlude1_very_many.c54
-rw-r--r--src/bin/image_blend_occlude2.c54
-rw-r--r--src/bin/image_blend_occlude2_few.c54
-rw-r--r--src/bin/image_blend_occlude2_many.c54
-rw-r--r--src/bin/image_blend_occlude2_very_many.c54
-rw-r--r--src/bin/image_blend_occlude3.c54
-rw-r--r--src/bin/image_blend_occlude3_few.c54
-rw-r--r--src/bin/image_blend_occlude3_many.c54
-rw-r--r--src/bin/image_blend_occlude3_very_many.c54
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c32
-rw-r--r--src/bin/image_blend_smooth_scaled.c32
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c32
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c32
-rw-r--r--src/bin/image_blend_solid_border.c32
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c30
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c30
-rw-r--r--src/bin/image_blend_solid_middle_border.c34
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c30
-rw-r--r--src/bin/image_blend_solid_unscaled.c26
-rw-r--r--src/bin/image_blend_unscaled.c26
-rw-r--r--src/bin/image_crossfade.c24
-rw-r--r--src/bin/image_data_argb.c61
-rw-r--r--src/bin/image_data_argb_alpha.c85
-rw-r--r--src/bin/image_data_ycbcr601pl.c92
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c28
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c26
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c98
-rw-r--r--src/bin/image_map_3d_1.c46
-rw-r--r--src/bin/image_map_3d_2.c60
-rw-r--r--src/bin/image_map_3d_3.c62
-rw-r--r--src/bin/image_map_3d_4.c60
-rw-r--r--src/bin/image_map_3d_5.c50
-rw-r--r--src/bin/image_map_3d_6.c50
-rw-r--r--src/bin/image_map_3d_flow.c86
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c20
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c28
-rw-r--r--src/bin/image_map_color_alpha_rotate.c26
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c18
-rw-r--r--src/bin/image_map_color_nearest_rotate.c20
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c20
-rw-r--r--src/bin/image_map_color_rotate.c18
-rw-r--r--src/bin/image_map_color_solid_rotate.c26
-rw-r--r--src/bin/image_map_nearest_rotate.c28
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c28
-rw-r--r--src/bin/image_map_rotate.c26
-rw-r--r--src/bin/image_map_solid_rotate.c16
-rw-r--r--src/bin/image_mask.c28
-rw-r--r--src/bin/image_mask_10.c40
-rw-r--r--src/bin/image_mask_11.c40
-rw-r--r--src/bin/image_mask_12.c38
-rw-r--r--src/bin/image_mask_13.c36
-rw-r--r--src/bin/image_mask_14.c42
-rw-r--r--src/bin/image_mask_15.c42
-rw-r--r--src/bin/image_mask_2.c34
-rw-r--r--src/bin/image_mask_3.c34
-rw-r--r--src/bin/image_mask_4.c36
-rw-r--r--src/bin/image_mask_5.c36
-rw-r--r--src/bin/image_mask_6.c36
-rw-r--r--src/bin/image_mask_7.c42
-rw-r--r--src/bin/image_mask_8.c36
-rw-r--r--src/bin/image_mask_9.c48
-rw-r--r--src/bin/image_quality_scale.c18
-rw-r--r--src/bin/poly_blend.c60
-rw-r--r--src/bin/proxy_image.c24
-rw-r--r--src/bin/proxy_image_offscreen.c24
-rw-r--r--src/bin/proxy_text_fixed.c39
-rw-r--r--src/bin/proxy_text_random.c40
-rw-r--r--src/bin/rect_blend.c12
-rw-r--r--src/bin/rect_blend_few.c12
-rw-r--r--src/bin/rect_blend_pow2.c12
-rw-r--r--src/bin/rect_blend_pow2_few.c12
-rw-r--r--src/bin/rect_solid.c12
-rw-r--r--src/bin/rect_solid_few.c12
-rw-r--r--src/bin/text_basic.c16
-rw-r--r--src/bin/text_change.c18
-rw-r--r--src/bin/text_styles.c26
-rw-r--r--src/bin/text_styles_different_strings.c26
-rw-r--r--src/bin/textblock_auto_align.c21
-rw-r--r--src/bin/textblock_basic.c19
-rw-r--r--src/bin/textblock_intl.c21
-rw-r--r--src/bin/textblock_text_append.c24
-rw-r--r--src/bin/ui.c269
-rw-r--r--src/bin/widgets_file_icons.c44
-rw-r--r--src/bin/widgets_file_icons_2.c32
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c36
-rw-r--r--src/bin/widgets_file_icons_2_same.c32
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c36
-rw-r--r--src/bin/widgets_file_icons_3.c40
-rw-r--r--src/bin/widgets_file_icons_4.c40
-rw-r--r--src/bin/widgets_list_1.c33
-rw-r--r--src/bin/widgets_list_1_grouped.c37
-rw-r--r--src/bin/widgets_list_2.c33
-rw-r--r--src/bin/widgets_list_2_grouped.c37
-rw-r--r--src/bin/widgets_list_3.c50
-rw-r--r--src/bin/widgets_list_3_grouped.c62
-rw-r--r--src/bin/widgets_list_4.c50
-rw-r--r--src/bin/widgets_list_4_grouped.c54
121 files changed, 2265 insertions, 2248 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index f36fdbc..084bd41 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,10 +8,10 @@ _setup(void)
8 Evas_Object *o; 8 Evas_Object *o;
9 Evas_Textblock_Style *st; 9 Evas_Textblock_Style *st;
10 10
11 o = evas_object_textblock_add(evas); 11 o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
12 evas_object_move(o, 10, 40); 12 eo_do(o, evas_obj_position_set(10, 40),
13 evas_object_resize(o, win_w - 20, win_h - 50); 13 evas_obj_size_set(win_w - 20, win_h - 50),
14 evas_object_show(o); 14 evas_obj_visibility_set(EINA_TRUE));
15 st = evas_textblock_style_new(); 15 st = evas_textblock_style_new();
16 evas_textblock_style_set 16 evas_textblock_style_set
17 (st, 17 (st,
@@ -21,12 +21,10 @@ _setup(void)
21 "p='+ font=Vera font_size=10 align=left'" 21 "p='+ font=Vera font_size=10 align=left'"
22 "/p='- \n \n'" 22 "/p='- \n \n'"
23 ); 23 );
24 evas_object_textblock_style_set(o, st); 24 eo_do(o, evas_obj_textblock_style_set(st),
25 evas_textblock_style_free(st); 25 evas_obj_textblock_clear(),
26 evas_object_textblock_clear(o); 26 evas_obj_textblock_text_markup_set
27 evas_object_textblock_text_markup_set 27 ("<center>"
28 (o,
29 "<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 "
32 "device environment all of its own. It is now made up of many " 30 "device environment all of its own. It is now made up of many "
@@ -43,7 +41,8 @@ _setup(void)
43 "layout descriptions that applications set up, dealing with the hard " 41 "layout descriptions that applications set up, dealing with the hard "
44 "work of doing the drawing for them." 42 "work of doing the drawing for them."
45 "</center>" 43 "</center>"
46 ); 44 ));
45 evas_textblock_style_free(st);
47 o_text = o; 46 o_text = o;
48 ui_fps(0.0); 47 ui_fps(0.0);
49} 48}
@@ -51,7 +50,7 @@ _setup(void)
51static void 50static void
52_cleanup(void) 51_cleanup(void)
53{ 52{
54 evas_object_del(o_text); 53 eo_del(o_text);
55 o_text = NULL; 54 o_text = NULL;
56} 55}
57 56
diff --git a/src/bin/filter_object_blur.c b/src/bin/filter_object_blur.c
index a7bac9b..27f6e2a 100644
--- a/src/bin/filter_object_blur.c
+++ b/src/bin/filter_object_blur.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_BLUR); 31 evas_object_filter_set(o, EVAS_FILTER_BLUR);
32 evas_object_filter_param_int_set(o, "radius", 3); 32 evas_object_filter_param_int_set(o, "radius", 3);
33 evas_object_show(o); 33 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
34 src = o; 34 src = o;
35 o_images[i] = src; 35 o_images[i] = src;
36 } 36 }
37 37
38 done = 0; 38 done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/filter_object_blur_solid.c b/src/bin/filter_object_blur_solid.c
index b61fd2c..c2e718e 100644
--- a/src/bin/filter_object_blur_solid.c
+++ b/src/bin/filter_object_blur_solid.c
@@ -24,16 +24,16 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_BLUR); 31 evas_object_filter_set(o, EVAS_FILTER_BLUR);
32 evas_object_filter_param_int_set(o, "radius", 5); 32 evas_object_filter_param_int_set(o, "radius", 5);
33 evas_object_layer_set(o,1); 33 eo_do(o, evas_obj_layer_set(1),
34 evas_object_show(o); 34 evas_obj_visibility_set(EINA_TRUE));
35 src = o; 35 src = o;
36 o_images[i] = src; 36 o_images[i] = src;
37 } 37 }
38 38
39 done = 0; 39 done = 0;
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 46 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -59,7 +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 evas_object_move(o_images[i], x, y); 62 eo_do(o_images[i], evas_obj_position_set(x, y));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/filter_object_brightness.c b/src/bin/filter_object_brightness.c
index a1d5ef6..4606200 100644
--- a/src/bin/filter_object_brightness.c
+++ b/src/bin/filter_object_brightness.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS); 31 evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
32 evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM); 32 evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
33 evas_object_show(o); 33 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
34 src = o; 34 src = o;
35 o_images[i] = src; 35 o_images[i] = src;
36 } 36 }
37 37
38 done = 0; 38 done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 evas_object_filter_param_float_set(o_images[i], "adjust", 62 evas_object_filter_param_float_set(o_images[i], "adjust",
63 ((i + f) % OBNUM) / (2.0 * OBNUM) - 1); 63 ((i + f) % OBNUM) / (2.0 * OBNUM) - 1);
64 } 64 }
diff --git a/src/bin/filter_object_brightness_solid.c b/src/bin/filter_object_brightness_solid.c
index 849482e..43fd173 100644
--- a/src/bin/filter_object_brightness_solid.c
+++ b/src/bin/filter_object_brightness_solid.c
@@ -24,17 +24,17 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS); 31 evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
32 evas_object_filter_param_float_set(o, "adjust", 32 evas_object_filter_param_float_set(o, "adjust",
33 i / (2.0 * OBNUM) - 1.0); 33 i / (2.0 * OBNUM) - 1.0);
34 evas_object_layer_set(o,1); 34 eo_do(o, evas_obj_layer_set(1),
35 evas_object_show(o); 35 evas_obj_visibility_set(EINA_TRUE));
36 src = o; 36 src = o;
37 o_images[i] = src; 37 o_images[i] = src;
38 } 38 }
39 39
40 done = 0; 40 done = 0;
@@ -44,7 +44,7 @@ static void _setup(void)
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 int i; 46 int i;
47 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 47 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
@@ -60,7 +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 evas_object_move(o_images[i], x, y); 63 eo_do(o_images[i], evas_obj_position_set(x, y));
64 evas_object_filter_param_float_set(o_images[i], "adjust", 64 evas_object_filter_param_float_set(o_images[i], "adjust",
65 (((i + f) % OBNUM) * 2.0) / (OBNUM) - 1.0); 65 (((i + f) % OBNUM) * 2.0) / (OBNUM) - 1.0);
66 } 66 }
diff --git a/src/bin/filter_object_colors.c b/src/bin/filter_object_colors.c
index 2b66799..f05c3cc 100644
--- a/src/bin/filter_object_colors.c
+++ b/src/bin/filter_object_colors.c
@@ -29,12 +29,12 @@ static void _setup(void)
29 29
30 for (i = 0; i < OBNUM; i++) 30 for (i = 0; i < OBNUM; i++)
31 { 31 {
32 o = evas_object_image_add(evas); 32 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
34 evas_object_image_fill_set(o, 0, 0, 120, 160); 34 evas_obj_image_fill_set(0, 0, 120, 160),
35 evas_object_resize(o, 120, 160); 35 evas_obj_size_set(120, 160));
36 evas_object_filter_set(o, filters[i % 3]); 36 evas_object_filter_set(o, filters[i % 3]);
37 evas_object_show(o); 37 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
38 src = o; 38 src = o;
39 o_images[i] = src; 39 o_images[i] = src;
40 } 40 }
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 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)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 evas_object_move(o_images[i], x, y); 65 eo_do(o_images[i], evas_obj_position_set(x, y));
66 } 66 }
67 FPS_STD(NAME); 67 FPS_STD(NAME);
68} 68}
diff --git a/src/bin/filter_object_colors_solid.c b/src/bin/filter_object_colors_solid.c
index 534ab81..95d18f8 100644
--- a/src/bin/filter_object_colors_solid.c
+++ b/src/bin/filter_object_colors_solid.c
@@ -29,13 +29,13 @@ static void _setup(void)
29 29
30 for (i = 0; i < OBNUM; i++) 30 for (i = 0; i < OBNUM; i++)
31 { 31 {
32 o = evas_object_image_add(evas); 32 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
33 evas_object_image_file_set(o, build_path("image.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
34 evas_object_image_fill_set(o, 0, 0, 120, 160); 34 evas_obj_image_fill_set(0, 0, 120, 160),
35 evas_object_resize(o, 120, 160); 35 evas_obj_size_set(120, 160));
36 evas_object_filter_set(o, filters[i % 3]); 36 evas_object_filter_set(o, filters[i % 3]);
37 evas_object_layer_set(o,1); 37 eo_do(o, evas_obj_layer_set(1),
38 evas_object_show(o); 38 evas_obj_visibility_set(EINA_TRUE));
39 src = o; 39 src = o;
40 o_images[i] = src; 40 o_images[i] = src;
41 } 41 }
@@ -47,7 +47,7 @@ static void _setup(void)
47static void _cleanup(void) 47static void _cleanup(void)
48{ 48{
49 int i; 49 int i;
50 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 50 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
51} 51}
52 52
53/* loop - do things */ 53/* loop - do things */
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 63 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
64 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 65 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
66 evas_object_move(o_images[i], x, y); 66 eo_do(o_images[i], evas_obj_position_set(x, y));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/filter_object_greyscale.c b/src/bin/filter_object_greyscale.c
index 0d41ddd..749f89c 100644
--- a/src/bin/filter_object_greyscale.c
+++ b/src/bin/filter_object_greyscale.c
@@ -24,14 +24,14 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_GREYSCALE); 31 evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
32 evas_object_show(o); 32 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
33 src = o; 33 src = o;
34 o_images[i] = src; 34 o_images[i] = src;
35 } 35 }
36 36
37 done = 0; 37 done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 evas_object_move(o_images[i], x, y); 60 eo_do(o_images[i], evas_obj_position_set(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/filter_object_greyscale_solid.c b/src/bin/filter_object_greyscale_solid.c
index 98373f5..b2695d5 100644
--- a/src/bin/filter_object_greyscale_solid.c
+++ b/src/bin/filter_object_greyscale_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_GREYSCALE); 31 evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
32 evas_object_layer_set(o,1); 32 eo_do(o, evas_obj_layer_set(1),
33 evas_object_show(o); 33 evas_obj_visibility_set(EINA_TRUE));
34 src = o; 34 src = o;
35 o_images[i] = src; 35 o_images[i] = src;
36 } 36 }
37 37
38 done = 0; 38 done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/filter_object_invert.c b/src/bin/filter_object_invert.c
index 506dd59..4f3c0a1 100644
--- a/src/bin/filter_object_invert.c
+++ b/src/bin/filter_object_invert.c
@@ -24,14 +24,14 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_INVERT); 31 evas_object_filter_set(o, EVAS_FILTER_INVERT);
32 evas_object_show(o); 32 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
33 src = o; 33 src = o;
34 o_images[i] = src; 34 o_images[i] = src;
35 } 35 }
36 36
37 done = 0; 37 done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 evas_object_move(o_images[i], x, y); 60 eo_do(o_images[i], evas_obj_position_set(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/filter_object_invert_solid.c b/src/bin/filter_object_invert_solid.c
index 03e4eaa..a67a4ae 100644
--- a/src/bin/filter_object_invert_solid.c
+++ b/src/bin/filter_object_invert_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_INVERT); 31 evas_object_filter_set(o, EVAS_FILTER_INVERT);
32 evas_object_layer_set(o,1); 32 eo_do(o, evas_obj_layer_set(1),
33 evas_object_show(o); 33 evas_obj_visibility_set(EINA_TRUE));
34 src = o; 34 src = o;
35 o_images[i] = src; 35 o_images[i] = src;
36 } 36 }
37 37
38 done = 0; 38 done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/filter_object_sepia.c b/src/bin/filter_object_sepia.c
index e9db58a..01a6239 100644
--- a/src/bin/filter_object_sepia.c
+++ b/src/bin/filter_object_sepia.c
@@ -24,14 +24,14 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_SEPIA); 31 evas_object_filter_set(o, EVAS_FILTER_SEPIA);
32 evas_object_show(o); 32 eo_do(o, evas_obj_visibility_set(EINA_TRUE));
33 src = o; 33 src = o;
34 o_images[i] = src; 34 o_images[i] = src;
35 } 35 }
36 36
37 done = 0; 37 done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 evas_object_move(o_images[i], x, y); 60 eo_do(o_images[i], evas_obj_position_set(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/filter_object_sepia_solid.c b/src/bin/filter_object_sepia_solid.c
index 3f092cf..3e7c20c 100644
--- a/src/bin/filter_object_sepia_solid.c
+++ b/src/bin/filter_object_sepia_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 24
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160));
31 evas_object_filter_set(o, EVAS_FILTER_SEPIA); 31 evas_object_filter_set(o, EVAS_FILTER_SEPIA);
32 evas_object_layer_set(o,1); 32 eo_do(o, evas_obj_layer_set(1),
33 evas_object_show(o); 33 evas_obj_visibility_set(EINA_TRUE));
34 src = o; 34 src = o;
35 o_images[i] = src; 35 o_images[i] = src;
36 } 36 }
37 37
38 done = 0; 38 done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 10d5b85..b5e683d 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("bar.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
29 evas_object_image_border_set(o, 6, 6, 6, 6); 29 evas_obj_image_border_set(6, 6, 6, 6),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 3e11840..b05d263 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,12 +23,12 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("pan.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
29 evas_object_color_set(o, 64, 64, 64, 255); 29 evas_obj_color_set(64, 64, 64, 255),
30 evas_object_image_border_set(o, 3, 3, 3, 3); 30 evas_obj_image_border_set(3, 3, 3, 3),
31 evas_object_show(o); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
48 for (i = 0; i < OBNUM; i++) 48 for (i = 0; i < OBNUM; i++)
49 { 49 {
50 w0 = 80; 50 w0 = 80;
51 h0 = 80; 51 h0 = 80;
52 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 52 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
53 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 53 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
54 x = (win_w / 2) - (w / 2); 54 x = (win_w / 2) - (w / 2);
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 evas_object_move(o_images[i], x, y); 58 eo_do(o_images[i], evas_obj_position_set(x, y),
59 evas_object_resize(o_images[i], w, h); 59 evas_obj_size_set(w, h),
60 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 60 evas_obj_image_fill_set(0, 0, w, h));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index f31acaa..c5d649b 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = evas_object_image_add(evas); 28 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 evas_object_image_file_set(o, build_path("logo.png"), NULL); 30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
31 evas_object_image_fill_set(o, 0, 0, 120, 160); 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_object_resize(o, 120, 160); 32 evas_obj_size_set(120, 160));
33 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
34 if (a < 128) a = 128; 34 if (a < 128) a = 128;
35 evas_object_color_set(o, a, a, a, a); 35 eo_do(o, evas_obj_color_set(a, a, a, a),
36 evas_object_show(o); 36 evas_obj_visibility_set(EINA_TRUE));
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
53 for (i = 0; i < OBNUM; i++) 53 for (i = 0; i < OBNUM; i++)
54 { 54 {
55 w = 120; 55 w = 120;
56 h = 160; 56 h = 160;
57 x = (win_w / 2) - (w / 2); 57 x = (win_w / 2) - (w / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 658110f..1361c53 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,15 +24,14 @@ static void _setup(void)
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 int a; 26 int a;
27 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 o = evas_object_image_add(evas); 28 o_images[i] = o;
29 o_images[i] = o; 29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
30 evas_object_image_file_set(o, build_path("logo.png"), NULL); 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_object_image_fill_set(o, 0, 0, 120, 160); 31 evas_obj_size_set(120, 160));
32 evas_object_resize(o, 120, 160);
33 a = rnd()&0xff; 32 a = rnd()&0xff;
34 evas_object_color_set(o, a, a, a, a); 33 eo_do(o, evas_obj_color_set(a, a, a, a),
35 evas_object_show(o); 34 evas_obj_visibility_set(EINA_TRUE));
36 } 35 }
37 done = 0; 36 done = 0;
38} 37}
@@ -41,7 +40,7 @@ static void _setup(void)
41static void _cleanup(void) 40static void _cleanup(void)
42{ 41{
43 int i; 42 int i;
44 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
45} 44}
46 45
47/* loop - do things */ 46/* loop - do things */
@@ -52,12 +51,12 @@ static void _loop(double t, int f)
52 for (i = 0; i < OBNUM; i++) 51 for (i = 0; i < OBNUM; i++)
53 { 52 {
54 w = 120; 53 w = 120;
55 h = 160; 54 h = 160;
56 x = (win_w / 2) - (w / 2); 55 x = (win_w / 2) - (w / 2);
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 evas_object_move(o_images[i], x, y); 59 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_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 52ba6d7..f2bad8b 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 0); 29 evas_obj_image_smooth_scale_set(0),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 40 + ((i % 3) * (w0 / 2)); 51 w = 40 + ((i % 3) * (w0 / 2));
52 h = 40 + ((i % 3) * (h0 / 2)); 52 h = 40 + ((i % 3) * (h0 / 2));
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 47a431e..951645e 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 0); 29 evas_obj_image_smooth_scale_set(0),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index e8979b4..21cb4be 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 0); 29 evas_obj_image_smooth_scale_set(0),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 40 + ((i % 3) * (w0 / 2)); 51 w = 40 + ((i % 3) * (w0 / 2));
52 h = 40 + ((i % 3) * (h0 / 2)); 52 h = 40 + ((i % 3) * (h0 / 2));
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 1bd75df..d0af1a5 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 0); 29 evas_obj_image_smooth_scale_set(0),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 098ee57..cefe973 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,22 +24,22 @@ static void _setup(void)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 evas_object_image_file_set(o, build_path("logo.png"), NULL); 30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
31 else 31 else
32 { 32 {
33 Evas_Coord x, y; 33 Evas_Coord x, y;
34 34
35 evas_object_image_file_set(o, build_path("image.png"), NULL); 35 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
36 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 36 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
37 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 37 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
38 evas_object_move(o, x, y); 38 eo_do(o, evas_obj_position_set(x, y));
39 } 39 }
40 evas_object_image_fill_set(o, 0, 0, 120, 160); 40 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
41 evas_object_resize(o, 120, 160); 41 evas_obj_size_set(120, 160),
42 evas_object_show(o); 42 evas_obj_visibility_set(EINA_TRUE));
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
58 Evas_Coord x, y, w, h; 58 Evas_Coord x, y, w, h;
59 for (i = 0; i < OBNUM; i++) 59 for (i = 0; i < OBNUM; i++)
60 { 60 {
61 if (i < (OBNUM / 2)) 61 if (i < (OBNUM / 2))
62 { 62 {
63 w = 120; 63 w = 120;
64 h = 160; 64 h = 160;
65 x = (win_w / 2) - (w / 2); 65 x = (win_w / 2) - (w / 2);
66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
67 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
69 evas_object_move(o_images[i], x, y); 69 eo_do(o_images[i], evas_obj_position_set(x, y));
70 } 70 }
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index c0ba2dc..830e181 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL); 33 eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL); 38 eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i < (OBNUM / 2)) 64 if (i < (OBNUM / 2))
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 02a0f09..1953967 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i < (OBNUM / 2)) 64 if (i < (OBNUM / 2))
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 51b44f8..856d5a5 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i < (OBNUM / 2)) 64 if (i < (OBNUM / 2))
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 4557bce..578f030 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,22 +24,22 @@ static void _setup(void)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 evas_object_image_file_set(o, build_path("logo.png"), NULL); 30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
31 else 31 else
32 { 32 {
33 Evas_Coord x, y; 33 Evas_Coord x, y;
34 34
35 evas_object_image_file_set(o, build_path("image.png"), NULL); 35 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
36 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 36 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
37 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 37 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
38 evas_object_move(o, x, y); 38 eo_do(o, evas_obj_position_set(x, y));
39 } 39 }
40 evas_object_image_fill_set(o, 0, 0, 120, 160); 40 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
41 evas_object_resize(o, 120, 160); 41 evas_obj_size_set(120, 160),
42 evas_object_show(o); 42 evas_obj_visibility_set(EINA_TRUE));
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
58 Evas_Coord x, y, w, h; 58 Evas_Coord x, y, w, h;
59 for (i = 0; i < OBNUM; i++) 59 for (i = 0; i < OBNUM; i++)
60 { 60 {
61 if (i & 0x1) 61 if (i & 0x1)
62 { 62 {
63 w = 120; 63 w = 120;
64 h = 160; 64 h = 160;
65 x = (win_w / 2) - (w / 2); 65 x = (win_w / 2) - (w / 2);
66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
67 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
69 evas_object_move(o_images[i], x, y); 69 eo_do(o_images[i], evas_obj_position_set(x, y));
70 } 70 }
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 8aca4b1..d0eb4bd 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i & 0x1) 64 if (i & 0x1)
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index b0ab9ba..405f5ca 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i & 0x1) 64 if (i & 0x1)
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 776ada8..d15445a 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i & 0x1) 64 if (i & 0x1)
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index fa69b97..db7edc7 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,22 +24,22 @@ static void _setup(void)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 evas_object_image_file_set(o, build_path("logo.png"), NULL); 30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
31 else 31 else
32 { 32 {
33 Evas_Coord x, y; 33 Evas_Coord x, y;
34 34
35 evas_object_image_file_set(o, build_path("image.png"), NULL); 35 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
36 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 36 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
37 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 37 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
38 evas_object_move(o, x, y); 38 eo_do(o, evas_obj_position_set(x, y));
39 } 39 }
40 evas_object_image_fill_set(o, 0, 0, 120, 160); 40 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
41 evas_object_resize(o, 120, 160); 41 evas_obj_size_set(120, 160),
42 evas_object_show(o); 42 evas_obj_visibility_set(EINA_TRUE));
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
58 Evas_Coord x, y, w, h; 58 Evas_Coord x, y, w, h;
59 for (i = 0; i < OBNUM; i++) 59 for (i = 0; i < OBNUM; i++)
60 { 60 {
61 if (i > (OBNUM / 2)) 61 if (i > (OBNUM / 2))
62 { 62 {
63 w = 120; 63 w = 120;
64 h = 160; 64 h = 160;
65 x = (win_w / 2) - (w / 2); 65 x = (win_w / 2) - (w / 2);
66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
67 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
69 evas_object_move(o_images[i], x, y); 69 eo_do(o_images[i], evas_obj_position_set(x, y));
70 } 70 }
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 92166f1..57888fc 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i > (OBNUM / 2)) 64 if (i > (OBNUM / 2))
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index aecb5ee..3dd41a4 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i > (OBNUM / 2)) 64 if (i > (OBNUM / 2))
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index ea353ba..43d3642 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = evas_object_image_add(evas); 30 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 evas_object_image_file_set(o, build_path("logo.png"), NULL); 33 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
34 else 34 else
35 { 35 {
36 Evas_Coord x, y; 36 Evas_Coord x, y;
37 37
38 evas_object_image_file_set(o, build_path("image.png"), NULL); 38 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 39 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 40 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
41 evas_object_move(o, x, y); 41 eo_do(o, evas_obj_position_set(x, y));
42 } 42 }
43 evas_object_image_fill_set(o, 0, 0, 120, 160); 43 eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
44 evas_object_resize(o, 120, 160); 44 evas_obj_size_set(120, 160),
45 evas_object_show(o); 45 evas_obj_visibility_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
61 Evas_Coord x, y, w, h; 61 Evas_Coord x, y, w, h;
62 for (i = 0; i < OBNUM; i++) 62 for (i = 0; i < OBNUM; i++)
63 { 63 {
64 if (i > (OBNUM / 2)) 64 if (i > (OBNUM / 2))
65 { 65 {
66 w = 120; 66 w = 120;
67 h = 160; 67 h = 160;
68 x = (win_w / 2) - (w / 2); 68 x = (win_w / 2) - (w / 2);
69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 69 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 71 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
72 evas_object_move(o_images[i], x, y); 72 eo_do(o_images[i], evas_obj_position_set(x, y));
73 } 73 }
74 } 74 }
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index a1e6fc3..2301899 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 1); 29 evas_obj_image_smooth_scale_set(1),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 40 + ((i % 3) * (w0 / 2)); 51 w = 40 + ((i % 3) * (w0 / 2));
52 h = 40 + ((i % 3) * (h0 / 2)); 52 h = 40 + ((i % 3) * (h0 / 2));
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index b2086f0..afa2b5d 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 1); 29 evas_obj_image_smooth_scale_set(1),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 41366a3..fe0763c 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 1); 29 evas_obj_image_smooth_scale_set(1),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 40 + ((i % 3) * (w0 / 2)); 51 w = 40 + ((i % 3) * (w0 / 2));
52 h = 40 + ((i % 3) * (h0 / 2)); 52 h = 40 + ((i % 3) * (h0 / 2));
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index e4028bd..db13620 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_smooth_scale_set(o, 1); 29 evas_obj_image_smooth_scale_set(1),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 2e1b0bb..7e05605 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("frame.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
29 evas_object_image_border_set(o, 8, 8, 8, 8); 29 evas_obj_image_border_set(8, 8, 8, 8),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
47 for (i = 0; i < OBNUM; i++) 47 for (i = 0; i < OBNUM; i++)
48 { 48 {
49 w0 = 80; 49 w0 = 80;
50 h0 = 80; 50 h0 = 80;
51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2); 51 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2); 52 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 evas_object_move(o_images[i], x, y); 57 eo_do(o_images[i], evas_obj_position_set(x, y),
58 evas_object_resize(o_images[i], w, h); 58 evas_obj_size_set(w, h),
59 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 59 evas_obj_image_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 1af71db..01e6e59 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = evas_object_image_add(evas); 28 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 evas_object_image_file_set(o, build_path("image.png"), NULL); 30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_object_image_fill_set(o, 0, 0, 120, 160); 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_object_resize(o, 120, 160); 32 evas_obj_size_set(120, 160));
33 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
34 if (a < 128) a = 128; 34 if (a < 128) a = 128;
35 evas_object_color_set(o, a, a, a, a); 35 eo_do(o, evas_obj_color_set(a, a, a, a),
36 evas_object_show(o); 36 evas_obj_visibility_set(EINA_TRUE));
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
53 for (i = 0; i < OBNUM; i++) 53 for (i = 0; i < OBNUM; i++)
54 { 54 {
55 w = 120; 55 w = 120;
56 h = 160; 56 h = 160;
57 x = (win_w / 2) - (w / 2); 57 x = (win_w / 2) - (w / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 evas_object_move(o_images[i], x, y); 61 eo_do(o_images[i], evas_obj_position_set(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 6a6cb9f..769d59c 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = evas_object_image_add(evas); 28 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 evas_object_image_file_set(o, build_path("image.png"), NULL); 30 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
31 evas_object_image_fill_set(o, 0, 0, 120, 160); 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_object_resize(o, 120, 160); 32 evas_obj_size_set(120, 160));
33 a = rnd()&0xff; 33 a = rnd()&0xff;
34 evas_object_color_set(o, a, a, a, a); 34 eo_do(o, evas_obj_color_set(a, a, a, a),
35 evas_object_show(o); 35 evas_obj_visibility_set(EINA_TRUE));
36 } 36 }
37 done = 0; 37 done = 0;
38} 38}
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -52,12 +52,12 @@ static void _loop(double t, int f)
52 for (i = 0; i < OBNUM; i++) 52 for (i = 0; i < OBNUM; i++)
53 { 53 {
54 w = 120; 54 w = 120;
55 h = 160; 55 h = 160;
56 x = (win_w / 2) - (w / 2); 56 x = (win_w / 2) - (w / 2);
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 evas_object_move(o_images[i], x, y); 60 eo_do(o_images[i], evas_obj_position_set(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 5a7d6f9..86c4a5f 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,12 +23,12 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("bar.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
29 evas_object_image_border_set(o, 6, 6, 6, 6); 29 evas_obj_image_border_set(6, 6, 6, 6),
30 evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); 30 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
31 evas_object_show(o); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
48 for (i = 0; i < OBNUM; i++) 48 for (i = 0; i < OBNUM; i++)
49 { 49 {
50 w0 = 80; 50 w0 = 80;
51 h0 = 80; 51 h0 = 80;
52 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 52 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
53 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 53 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
54 x = (win_w / 2) - (w / 2); 54 x = (win_w / 2) - (w / 2);
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 evas_object_move(o_images[i], x, y); 58 eo_do(o_images[i], evas_obj_position_set(x, y),
59 evas_object_resize(o_images[i], w, h); 59 evas_obj_size_set(w, h),
60 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 60 evas_obj_image_fill_set(0, 0, w, h));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index b2a30ca..82860e8 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,14 +23,14 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160),
31 evas_object_image_border_set(o, 43, 48, 48, 83); 31 evas_obj_image_border_set(43, 48, 48, 83),
32 evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); 32 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
33 evas_object_show(o); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 42 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
@@ -50,12 +50,12 @@ static void _loop(double t, int f)
50 for (i = 0; i < OBNUM; i++) 50 for (i = 0; i < OBNUM; i++)
51 { 51 {
52 w = 120; 52 w = 120;
53 h = 160; 53 h = 160;
54 x = (win_w / 2) - (w / 2); 54 x = (win_w / 2) - (w / 2);
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 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)) * (h / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
58 evas_object_move(o_images[i], x, y); 58 eo_do(o_images[i], evas_obj_position_set(x, y));
59 } 59 }
60 FPS_STD(NAME); 60 FPS_STD(NAME);
61} 61}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 136323e..e53b20f 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,12 +23,12 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("image.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160),
31 evas_object_show(o); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
48 for (i = 0; i < OBNUM; i++) 48 for (i = 0; i < OBNUM; i++)
49 { 49 {
50 w = 120; 50 w = 120;
51 h = 160; 51 h = 160;
52 x = (win_w / 2) - (w / 2); 52 x = (win_w / 2) - (w / 2);
53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
54 y = (win_h / 2) - (h / 2); 54 y = (win_h / 2) - (h / 2);
55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
56 evas_object_move(o_images[i], x, y); 56 eo_do(o_images[i], evas_obj_position_set(x, y));
57 } 57 }
58 FPS_STD(NAME); 58 FPS_STD(NAME);
59} 59}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 02feb60..65f3f6b 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,12 +23,12 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = evas_object_image_add(evas); 26 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("logo.png"), NULL); 28 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
29 evas_object_image_fill_set(o, 0, 0, 120, 160); 29 evas_obj_image_fill_set(0, 0, 120, 160),
30 evas_object_resize(o, 120, 160); 30 evas_obj_size_set(120, 160),
31 evas_object_show(o); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
48 for (i = 0; i < OBNUM; i++) 48 for (i = 0; i < OBNUM; i++)
49 { 49 {
50 w = 120; 50 w = 120;
51 h = 160; 51 h = 160;
52 x = (win_w / 2) - (w / 2); 52 x = (win_w / 2) - (w / 2);
53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
54 y = (win_h / 2) - (h / 2); 54 y = (win_h / 2) - (h / 2);
55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
56 evas_object_move(o_images[i], x, y); 56 eo_do(o_images[i], evas_obj_position_set(x, y));
57 } 57 }
58 FPS_STD(NAME); 58 FPS_STD(NAME);
59} 59}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 3a824a8..b5694c3 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,19 +22,19 @@ static void _setup(void)
22{ 22{
23 Evas_Object *o; 23 Evas_Object *o;
24 24
25 o = evas_object_image_add(evas); 25 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 evas_object_image_file_set(o, build_path("im1.png"), NULL); 27 eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
28 evas_object_image_fill_set(o, 0, 0, 720, 420); 28 evas_obj_image_fill_set(0, 0, 720, 420),
29 evas_object_resize(o, 720, 420); 29 evas_obj_size_set(720, 420),
30 evas_object_show(o); 30 evas_obj_visibility_set(EINA_TRUE));
31 31
32 o = evas_object_image_add(evas); 32 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
33 o_images[1] = o; 33 o_images[1] = o;
34 evas_object_image_file_set(o, build_path("im2.png"), NULL); 34 eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
35 evas_object_image_fill_set(o, 0, 0, 720, 420); 35 evas_obj_image_fill_set(0, 0, 720, 420),
36 evas_object_resize(o, 720, 420); 36 evas_obj_size_set(720, 420),
37 evas_object_show(o); 37 evas_obj_visibility_set(EINA_TRUE));
38 38
39 done = 0; 39 done = 0;
40} 40}
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < 2; i++) evas_object_del(o_images[i]); 46 for (i = 0; i < 2; i++) eo_del(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -53,7 +53,7 @@ static void _loop(double t, int f)
53 53
54 a = f & 0x1f; 54 a = f & 0x1f;
55 a = ((a << 3) | (a >> 2)) & 0xff; 55 a = ((a << 3) | (a >> 2)) & 0xff;
56 evas_object_color_set(o_images[1], a, a, a, a); 56 eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
57 FPS_STD(NAME); 57 FPS_STD(NAME);
58} 58}
59 59
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 90f6779..6bdbc2f 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < 1; i++) 25 for (i = 0; i < 1; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 29 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
30 evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888); 30 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
31 evas_object_image_size_set(o, 640, 480); 31 evas_obj_image_size_set(640, 480),
32 evas_object_image_alpha_set(o, 0); 32 evas_obj_image_alpha_set(0),
33 evas_object_image_fill_set(o, 0, 0, 640, 480); 33 evas_obj_image_fill_set(0, 0, 640, 480),
34 evas_object_resize(o, 640, 480); 34 evas_obj_size_set(640, 480),
35 evas_object_show(o); 35 evas_obj_visibility_set(EINA_TRUE));
36 } 36 }
37 done = 0; 37 done = 0;
38} 38}
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < 1; i++) evas_object_del(o_images[i]); 44 for (i = 0; i < 1; i++) eo_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -51,29 +51,30 @@ static void _loop(double t, int f)
51 Evas_Coord x, y, w, h; 51 Evas_Coord x, y, w, h;
52 for (i = 0; i < 1; i++) 52 for (i = 0; i < 1; i++)
53 { 53 {
54 unsigned int *data, *p; 54 unsigned int *data, *p;
55 55
56 w = 640; 56 w = 640;
57 h = 480; 57 h = 480;
58 x = (win_w / 2) - (w / 2); 58 x = (win_w / 2) - (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 evas_object_move(o_images[i], x, y); 60 eo_do(o_images[i], evas_obj_position_set(x, y),
61 evas_object_resize(o_images[i], w, h); 61 evas_obj_size_set(w, h),
62 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 62 evas_obj_image_fill_set(0, 0, w, h),
63 data = evas_object_image_data_get(o_images[i], 1); 63 evas_obj_image_data_get(1, (void **) &data),
64 st = evas_object_image_stride_get(o_images[i]) >> 2; 64 evas_obj_image_stride_get(&st));
65 p = data; 65 st = st >> 2;
66 for (y = 0; y < h; y++) 66 p = data;
67 { 67 for (y = 0; y < h; y++)
68 for (x = 0; x < w; x++) 68 {
69 { 69 for (x = 0; x < w; x++)
70 *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000; 70 {
71 p++; 71 *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
72 } 72 p++;
73 }
73 p += (st - w); 74 p += (st - w);
74 } 75 }
75 evas_object_image_data_set(o_images[i], data); 76 eo_do(o_images[i], evas_obj_image_data_set(data),
76 evas_object_image_data_update_add(o_images[i], 0, 0, w, h); 77 evas_obj_image_data_update_add( 0, 0, w, h));
77 } 78 }
78 FPS_STD(NAME); 79 FPS_STD(NAME);
79} 80}
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 1498fb7..1dae2f1 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -24,15 +24,15 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < 1; i++) 25 for (i = 0; i < 1; i++)
26 { 26 {
27 o = evas_object_image_add(evas); 27 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 29 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
30 evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888); 30 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
31 evas_object_image_size_set(o, 640, 480); 31 evas_obj_image_size_set(640, 480),
32 evas_object_image_alpha_set(o, 1); 32 evas_obj_image_alpha_set(1),
33 evas_object_image_fill_set(o, 0, 0, 640, 480); 33 evas_obj_image_fill_set(0, 0, 640, 480),
34 evas_object_resize(o, 640, 480); 34 evas_obj_size_set(640, 480),
35 evas_object_show(o); 35 evas_obj_visibility_set(EINA_TRUE));
36 } 36 }
37 done = 0; 37 done = 0;
38} 38}
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < 1; i++) evas_object_del(o_images[i]); 44 for (i = 0; i < 1; i++) eo_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -51,40 +51,41 @@ static void _loop(double t, int f)
51 Evas_Coord x, y, w, h; 51 Evas_Coord x, y, w, h;
52 for (i = 0; i < 1; i++) 52 for (i = 0; i < 1; i++)
53 { 53 {
54 unsigned int *data, *p; 54 unsigned int *data, *p;
55 int a, r, g, b; 55 int a, r, g, b;
56 w = 640; 56 w = 640;
57 h = 480; 57 h = 480;
58 x = (win_w / 2) - (w / 2); 58 x = (win_w / 2) - (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 evas_object_move(o_images[i], x, y); 60 eo_do(o_images[i], evas_obj_position_set(x, y),
61 evas_object_resize(o_images[i], w, h); 61 evas_obj_size_set(w, h),
62 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 62 evas_obj_image_fill_set(0, 0, w, h),
63 data = evas_object_image_data_get(o_images[i], 1); 63 evas_obj_image_data_get(1, (void **) &data),
64 st = evas_object_image_stride_get(o_images[i]) >> 2; 64 evas_obj_image_stride_get(&st));
65 p = data; 65 st = st >> 2;
66 for (y = 0; y < h; y++) 66 p = data;
67 { 67 for (y = 0; y < h; y++)
68 for (x = 0; x < w; x++) 68 {
69 { 69 for (x = 0; x < w; x++)
70 r = (x * y / 7) + f; 70 {
71 g = (x / 2); 71 r = (x * y / 7) + f;
72 b = (y / 2); 72 g = (x / 2);
73 a = (x + y); 73 b = (y / 2);
74 r &= 0xff; 74 a = (x + y);
75 g &= 0xff; 75 r &= 0xff;
76 b &= 0xff; 76 g &= 0xff;
77 a &= 0xff; 77 b &= 0xff;
78 r = (a * r) / 255; 78 a &= 0xff;
79 g = (a * g) / 255; 79 r = (a * r) / 255;
80 b = (a * b) / 255; 80 g = (a * g) / 255;
81 *p = (a << 24) | (r << 16) | (g << 8) | b; 81 b = (a * b) / 255;
82 p++; 82 *p = (a << 24) | (r << 16) | (g << 8) | b;
83 } 83 p++;
84 }
84 p += (st - w); 85 p += (st - w);
85 } 86 }
86 evas_object_image_data_set(o_images[i], data); 87 eo_do(o_images[i], evas_obj_image_data_set(data),
87 evas_object_image_data_update_add(o_images[i], 0, 0, w, h); 88 evas_obj_image_data_update_add( 0, 0, w, h));
88 } 89 }
89 FPS_STD(NAME); 90 FPS_STD(NAME);
90} 91}
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index d3be38f..3ecbc8b 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -28,44 +28,44 @@ static void _setup(void)
28 Evas_Object *o; 28 Evas_Object *o;
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = evas_object_image_add(evas); 31 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
32 o_images[i] = o; 32 o_images[i] = o;
33 evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 33 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL); 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_object_image_size_set(o, 640, 480); 35 evas_obj_image_size_set(640, 480),
36 evas_object_image_alpha_set(o, 0); 36 evas_obj_image_alpha_set(0),
37 evas_object_image_fill_set(o, 0, 0, 640, 480); 37 evas_obj_image_fill_set(0, 0, 640, 480),
38 evas_object_resize(o, 640, 480); 38 evas_obj_size_set(640, 480),
39 evas_object_show(o); 39 evas_obj_visibility_set(EINA_TRUE));
40 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 41 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
43 f = fopen(build_path("tp.yuv"), "rb"); 43 f = fopen(build_path("tp.yuv"), "rb");
44 if (f) 44 if (f)
45 { 45 {
46 r = fread(yp, 640 * 480, 1, f); 46 r = fread(yp, 640 * 480, 1, f);
47 r = fread(up, 320 * 240, 1, f); 47 r = fread(up, 320 * 240, 1, f);
48 r = fread(vp, 320 * 240, 1, f); 48 r = fread(vp, 320 * 240, 1, f);
49 fclose(f); 49 fclose(f);
50 } 50 }
51 data = evas_object_image_data_get(o_images[i], 1); 51 data = evas_object_image_data_get(o_images[i], 1);
52 lp = data; 52 lp = data;
53 for (y = 0; y < 480; y++) 53 for (y = 0; y < 480; y++)
54 { 54 {
55 *lp = yp + (y * 640); 55 *lp = yp + (y * 640);
56 lp++; 56 lp++;
57 } 57 }
58 for (y = 0; y < 240; y++) 58 for (y = 0; y < 240; y++)
59 { 59 {
60 *lp = up + (y * 320); 60 *lp = up + (y * 320);
61 lp++; 61 lp++;
62 } 62 }
63 for (y = 0; y < 240; y++) 63 for (y = 0; y < 240; y++)
64 { 64 {
65 *lp = vp + (y * 320); 65 *lp = vp + (y * 320);
66 lp++; 66 lp++;
67 } 67 }
68 evas_object_image_data_set(o_images[i], data); 68 eo_do(o_images[i], evas_obj_image_data_set(data));
69 } 69 }
70 done = 0; 70 done = 0;
71} 71}
@@ -74,7 +74,7 @@ static void _setup(void)
74static void _cleanup(void) 74static void _cleanup(void)
75{ 75{
76 int i; 76 int i;
77 for (i = 0; i < 1; i++) evas_object_del(o_images[i]); 77 for (i = 0; i < 1; i++) eo_del(o_images[i]);
78 free(yp); 78 free(yp);
79 free(up); 79 free(up);
80 free(vp); 80 free(vp);
@@ -88,13 +88,13 @@ static void _loop(double t, int f)
88 for (i = 0; i < 1; i++) 88 for (i = 0; i < 1; i++)
89 { 89 {
90 w = 640; 90 w = 640;
91 h = 480; 91 h = 480;
92 x = (win_w / 2) - (w / 2); 92 x = (win_w / 2) - (w / 2);
93 y = (win_h / 2) - (h / 2); 93 y = (win_h / 2) - (h / 2);
94 evas_object_move(o_images[i], x, y); 94 eo_do(o_images[i], evas_obj_position_set(x, y),
95 evas_object_resize(o_images[i], w, h); 95 evas_obj_size_set(w, h),
96 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 96 evas_obj_image_fill_set(0, 0, w, h),
97 evas_object_image_data_update_add(o_images[i], 0, 0, 640, 480); 97 evas_obj_image_data_update_add( 0, 0, 640, 480));
98 } 98 }
99 FPS_STD(NAME); 99 FPS_STD(NAME);
100} 100}
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 3b827fa..14cc7a9 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -28,16 +28,16 @@ static void _setup(void)
28 Evas_Object *o; 28 Evas_Object *o;
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = evas_object_image_add(evas); 31 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
32 o_images[i] = o; 32 o_images[i] = o;
33 evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 33 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL); 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_object_image_size_set(o, 640, 480); 35 evas_obj_image_size_set(640, 480),
36 evas_object_image_alpha_set(o, 0); 36 evas_obj_image_alpha_set(0),
37 evas_object_image_fill_set(o, 0, 0, 640, 480); 37 evas_obj_image_fill_set(0, 0, 640, 480),
38 evas_object_resize(o, 640, 480); 38 evas_obj_size_set(640, 480),
39 evas_object_image_smooth_scale_set(o, 0); 39 evas_obj_image_smooth_scale_set(0),
40 evas_object_show(o); 40 evas_obj_visibility_set(EINA_TRUE));
41 yp = malloc(640 * 480); 41 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 42 up = malloc(320 * 240);
43 vp = malloc(320 * 240); 43 vp = malloc(320 * 240);
@@ -66,7 +66,7 @@ static void _setup(void)
66 *lp = vp + (y * 320); 66 *lp = vp + (y * 320);
67 lp++; 67 lp++;
68 } 68 }
69 evas_object_image_data_set(o_images[i], data); 69 eo_do(o_images[i], evas_obj_image_data_set(data));
70 } 70 }
71 done = 0; 71 done = 0;
72} 72}
@@ -75,7 +75,7 @@ static void _setup(void)
75static void _cleanup(void) 75static void _cleanup(void)
76{ 76{
77 int i; 77 int i;
78 for (i = 0; i < 1; i++) evas_object_del(o_images[i]); 78 for (i = 0; i < 1; i++) eo_del(o_images[i]);
79 free(yp); 79 free(yp);
80 free(up); 80 free(up);
81 free(vp); 81 free(vp);
@@ -100,8 +100,8 @@ static void _loop(double t, int f)
100 100
101 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));
102 102
103 evas_object_map_enable_set(o_images[i], 1); 103 eo_do(o_images[i], evas_obj_map_enable_set(1),
104 evas_object_map_set(o_images[i], m); 104 evas_obj_map_set(m));
105 } 105 }
106 FPS_STD(NAME); 106 FPS_STD(NAME);
107} 107}
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 290f716..17558dd 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -28,15 +28,15 @@ static void _setup(void)
28 Evas_Object *o; 28 Evas_Object *o;
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = evas_object_image_add(evas); 31 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
32 o_images[i] = o; 32 o_images[i] = o;
33 evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 33 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL); 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_object_image_size_set(o, 640, 480); 35 evas_obj_image_size_set(640, 480),
36 evas_object_image_alpha_set(o, 0); 36 evas_obj_image_alpha_set(0),
37 evas_object_image_fill_set(o, 0, 0, 640, 480); 37 evas_obj_image_fill_set(0, 0, 640, 480),
38 evas_object_resize(o, 640, 480); 38 evas_obj_size_set(640, 480),
39 evas_object_show(o); 39 evas_obj_visibility_set(EINA_TRUE));
40 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 41 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
@@ -65,7 +65,7 @@ static void _setup(void)
65 *lp = vp + (y * 320); 65 *lp = vp + (y * 320);
66 lp++; 66 lp++;
67 } 67 }
68 evas_object_image_data_set(o_images[i], data); 68 eo_do(o_images[i], evas_obj_image_data_set(data));
69 } 69 }
70 done = 0; 70 done = 0;
71} 71}
@@ -74,7 +74,7 @@ static void _setup(void)
74static void _cleanup(void) 74static void _cleanup(void)
75{ 75{
76 int i; 76 int i;
77 for (i = 0; i < 1; i++) evas_object_del(o_images[i]); 77 for (i = 0; i < 1; i++) eo_del(o_images[i]);
78 free(yp); 78 free(yp);
79 free(up); 79 free(up);
80 free(vp); 80 free(vp);
@@ -98,8 +98,8 @@ static void _loop(double t, int f)
98 98
99 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));
100 100
101 evas_object_map_enable_set(o_images[i], 1); 101 eo_do(o_images[i], evas_obj_map_enable_set(1),
102 evas_object_map_set(o_images[i], m); 102 evas_obj_map_set(m));
103 } 103 }
104 FPS_STD(NAME); 104 FPS_STD(NAME);
105} 105}
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index e46e94b..88deeaf 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -28,48 +28,48 @@ static void _setup(void)
28 Evas_Object *o; 28 Evas_Object *o;
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = evas_object_image_add(evas); 31 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
32 o_images[i] = o; 32 o_images[i] = o;
33 evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 33 eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL); 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_object_image_size_set(o, 320, 480); 35 evas_obj_image_size_set(320, 480),
36 evas_object_image_alpha_set(o, 0); 36 evas_obj_image_alpha_set(0),
37 evas_object_image_fill_set(o, 0, 0, 640, 480); 37 evas_obj_image_fill_set(0, 0, 640, 480),
38 evas_object_resize(o, 640, 480); 38 evas_obj_size_set(640, 480),
39 evas_object_show(o); 39 evas_obj_visibility_set(EINA_TRUE));
40 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 41 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
43 f = fopen(build_path("tp.yuv"), "rb"); 43 f = fopen(build_path("tp.yuv"), "rb");
44 if (f) 44 if (f)
45 { 45 {
46 r = fread(yp, 640 * 480, 1, f); 46 r = fread(yp, 640 * 480, 1, f);
47 r = fread(up, 320 * 240, 1, f); 47 r = fread(up, 320 * 240, 1, f);
48 r = fread(vp, 320 * 240, 1, f); 48 r = fread(vp, 320 * 240, 1, f);
49 fclose(f); 49 fclose(f);
50 } 50 }
51 data = evas_object_image_data_get(o_images[i], 1); 51 data = evas_object_image_data_get(o_images[i], 1);
52 if (data) 52 if (data)
53 { 53 {
54 lp = data; 54 lp = data;
55 for (y = 0; y < 480; y++) 55 for (y = 0; y < 480; y++)
56 { 56 {
57 *lp = yp + (y * 640); 57 *lp = yp + (y * 640);
58 lp++; 58 lp++;
59 } 59 }
60 for (y = 0; y < 240; y++) 60 for (y = 0; y < 240; y++)
61 { 61 {
62 *lp = up + (y * 320); 62 *lp = up + (y * 320);
63 lp++; 63 lp++;
64 } 64 }
65 for (y = 0; y < 240; y++) 65 for (y = 0; y < 240; y++)
66 { 66 {
67 *lp = vp + (y * 320); 67 *lp = vp + (y * 320);
68 lp++; 68 lp++;
69 } 69 }
70 evas_object_image_data_set(o_images[i], data); 70 eo_do(o_images[i], evas_obj_image_data_set(data),
71 evas_object_image_data_update_add(o_images[i], 0, 0, 320, 480); 71 evas_obj_image_data_update_add( 0, 0, 320, 480));
72 } 72 }
73 } 73 }
74 done = 0; 74 done = 0;
75} 75}
@@ -78,7 +78,7 @@ static void _setup(void)
78static void _cleanup(void) 78static void _cleanup(void)
79{ 79{
80 int i; 80 int i;
81 for (i = 0; i < 1; i++) evas_object_del(o_images[i]); 81 for (i = 0; i < 1; i++) eo_del(o_images[i]);
82 free(yp); 82 free(yp);
83 free(up); 83 free(up);
84 free(vp); 84 free(vp);
@@ -97,9 +97,9 @@ static void _loop(double t, int f)
97 h = 480; 97 h = 480;
98 x = (win_w / 2) - (w / 2); 98 x = (win_w / 2) - (w / 2);
99 y = (win_h / 2) - (h / 2); 99 y = (win_h / 2) - (h / 2);
100 evas_object_move(o_images[i], x, y); 100 eo_do(o_images[i], evas_obj_position_set(x, y));
101 evas_object_resize(o_images[i], w, h); 101 eo_do(o_images[i], evas_obj_size_set(w, h));
102 evas_object_image_fill_set(o_images[i], 0, 0, w, h); 102 eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
103 103
104 w = 320 - 16 + f; 104 w = 320 - 16 + f;
105 if (w < 1) w = 1; 105 if (w < 1) w = 1;
@@ -107,7 +107,7 @@ static void _loop(double t, int f)
107 107
108 w &= ~0x1; 108 w &= ~0x1;
109 109
110 evas_object_image_size_set(o_images[i], w, 480); 110 eo_do(o_images[i], evas_obj_image_size_set(w, 480));
111 data = evas_object_image_data_get(o_images[i], 1); 111 data = evas_object_image_data_get(o_images[i], 1);
112 if (data) 112 if (data)
113 { 113 {
@@ -127,8 +127,8 @@ static void _loop(double t, int f)
127 *lp = vp + (y * 320); 127 *lp = vp + (y * 320);
128 lp++; 128 lp++;
129 } 129 }
130 evas_object_image_data_set(o_images[i], data); 130 eo_do(o_images[i], evas_obj_image_data_set(data));
131 evas_object_image_data_update_add(o_images[i], 0, 0, w, 480); 131 eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
132 } 132 }
133 } 133 }
134 FPS_STD(NAME); 134 FPS_STD(NAME);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index d3b65b8..b4ad6b6 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = evas_object_image_add(evas); 57 o = eo_add(EVAS_OBJ_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 evas_object_image_file_set(o, build_path(buf), NULL); 60 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
61 evas_object_image_fill_set(o, 0, 0, 256, 256); 61 evas_obj_image_fill_set(0, 0, 256, 256),
62 evas_object_resize(o, 256, 256); 62 evas_obj_size_set(256, 256),
63 evas_object_image_smooth_scale_set(o, 0); 63 evas_obj_image_smooth_scale_set(0),
64 evas_object_show(o); 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);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
72 POINT(1, 1, w, -h, d, 256, 0); 72 POINT(1, 1, w, -h, d, 256, 0);
73 POINT(1, 2, w, h, d, 256, 256); 73 POINT(1, 2, w, h, d, 256, 256);
74 POINT(1, 3, w, h, -d, 0, 256); 74 POINT(1, 3, w, h, -d, 0, 256);
75 75
76 POINT(2, 0, w, -h, d, 0, 0); 76 POINT(2, 0, w, -h, d, 0, 0);
77 POINT(2, 1, -w, -h, d, 256, 0); 77 POINT(2, 1, -w, -h, d, 256, 0);
78 POINT(2, 2, -w, h, d, 256, 256); 78 POINT(2, 2, -w, h, d, 256, 256);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
82 POINT(3, 1, -w, -h, -d, 256, 0); 82 POINT(3, 1, -w, -h, -d, 256, 0);
83 POINT(3, 2, -w, h, -d, 256, 256); 83 POINT(3, 2, -w, h, -d, 256, 256);
84 POINT(3, 3, -w, h, d, 0, 256); 84 POINT(3, 3, -w, h, d, 0, 256);
85 85
86 POINT(4, 0, -w, -h, d, 0, 0); 86 POINT(4, 0, -w, -h, d, 0, 0);
87 POINT(4, 1, w, -h, d, 256, 0); 87 POINT(4, 1, w, -h, d, 256, 0);
88 POINT(4, 2, w, -h, -d, 256, 256); 88 POINT(4, 2, w, -h, -d, 256, 256);
89 POINT(4, 3, -w, -h, -d, 0, 256); 89 POINT(4, 3, -w, -h, -d, 0, 256);
90 90
91 POINT(5, 0, -w, h, -d, 0, 0); 91 POINT(5, 0, -w, h, -d, 0, 0);
92 POINT(5, 1, w, h, -d, 256, 0); 92 POINT(5, 1, w, h, -d, 256, 0);
93 POINT(5, 2, w, h, d, 256, 256); 93 POINT(5, 2, w, h, d, 256, 256);
94 POINT(5, 3, -w, h, d, 0, 256); 94 POINT(5, 3, -w, h, d, 0, 256);
95 95
96 return c; 96 return c;
97} 97}
98 98
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
104 static Evas_Map *m = NULL; 104 static Evas_Map *m = NULL;
105 int i, j, order[6], sorted; 105 int i, j, order[6], sorted;
106 Evas_Coord mz[6]; 106 Evas_Coord mz[6];
107 107
108 if (!m) m = evas_map_new(4); 108 if (!m) m = evas_map_new(4);
109 evas_map_smooth_set(m, 0); 109 evas_map_smooth_set(m, 0);
110 110
111 for (i = 0; i < 6; i++) 111 for (i = 0; i < 6; i++)
112 { 112 {
113 Evas_Coord tz[4]; 113 Evas_Coord tz[4];
114 114
115 for (j = 0; j < 4; j++) 115 for (j = 0; j < 4; j++)
116 { 116 {
117 evas_map_point_coord_set(m, j, 117 evas_map_point_coord_set(m, j,
118 c->side[i].pt[j].x + x, 118 c->side[i].pt[j].x + x,
119 c->side[i].pt[j].y + y, 119 c->side[i].pt[j].y + y,
120 c->side[i].pt[j].z + z); 120 c->side[i].pt[j].z + z);
121 evas_map_point_image_uv_set(m, j, 121 evas_map_point_image_uv_set(m, j,
122 c->side[i].pt[j].u, 122 c->side[i].pt[j].u,
@@ -130,13 +130,13 @@ _cube_pos(Cube *c,
130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
131 if (evas_map_util_clockwise_get(m)) 131 if (evas_map_util_clockwise_get(m))
132 { 132 {
133 evas_object_map_enable_set(c->side[i].o, 1); 133 eo_do(c->side[i].o, evas_obj_map_enable_set(1),
134 evas_object_map_set(c->side[i].o, m); 134 evas_obj_map_set(m),
135 evas_object_show(c->side[i].o); 135 evas_obj_visibility_set(EINA_TRUE));
136 } 136 }
137 else 137 else
138 evas_object_hide(c->side[i].o); 138 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
139 139
140 order[i] = i; 140 order[i] = i;
141 for (j = 0; j < 4; j++) 141 for (j = 0; j < 4; j++)
142 evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j])); 142 evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -159,17 +159,17 @@ _cube_pos(Cube *c,
159 } 159 }
160 while (!sorted); 160 while (!sorted);
161 161
162 evas_object_raise(c->side[order[0]].o); 162 eo_do(c->side[order[0]].o, evas_obj_raise());
163 for (i = 1; i < 6; i++) 163 for (i = 1; i < 6; i++)
164 evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o); 164 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
165} 165}
166 166
167static void 167static void
168_cube_free(Cube *c) 168_cube_free(Cube *c)
169{ 169{
170 int i; 170 int i;
171 171
172 for (i = 0; i < 6; i++) evas_object_del(c->side[i].o); 172 for (i = 0; i < 6; i++) eo_del(c->side[i].o);
173 free(c); 173 free(c);
174} 174}
175 175
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 9d10462..dde2c0d 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,13 +54,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = evas_object_image_add(evas); 57 o = eo_add(EVAS_OBJ_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 evas_object_image_file_set(o, build_path(buf), NULL); 60 eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
61 evas_object_image_fill_set(o, 0, 0, 256, 256); 61 evas_obj_image_fill_set(0, 0, 256, 256),
62 evas_object_resize(o, 256, 256); <