diff --git a/src/bin/cxx/font_effect_blur_alpha.cc b/src/bin/cxx/font_effect_blur_alpha.cc index ac0f7de..e4937d0 100644 --- a/src/bin/cxx/font_effect_blur_alpha.cc +++ b/src/bin/cxx/font_effect_blur_alpha.cc @@ -1,7 +1,19 @@ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "Eo.h" +#include "Evas.h" + +#include "Eo.hh" +#include "Eina.hh" +#include "Evas.hh" + #include "main.h" -#include "ui.h" - +#define EXPEDITE_CXX_TEST_IMPL +#include /* standard var */ static int done = 0; @@ -52,7 +64,7 @@ static void _key(char *key) KEY_STD; } -void FNAME(void) +extern "C" void FNAME(void) { ui_func_set(_key, _loop); _setup(); diff --git a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc index bc67572..50f1403 100644 --- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc +++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc @@ -21,7 +21,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[MANYNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < MANYNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; n = rnd() % 100; w = 3 + ((n * (60 - 3)) / 100); h = 4 + ((n * (80 - 4)) / 100); @@ -49,7 +49,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]); + for (i = 0; i < MANYNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -59,12 +59,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < MANYNUM; i++) { - eo_do(o_images[i], evas_obj_size_get(&w, &h)); + eo_do(images[i], evas_obj_size_get(&w, &h)); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc index b7f267c..4bd2728 100644 --- a/src/bin/cxx/image_blend_nearest_same_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc @@ -18,7 +18,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(0), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -59,7 +59,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc index 921b4c6..85f2863 100644 --- a/src/bin/cxx/image_blend_nearest_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_scaled.cc @@ -13,11 +13,12 @@ #include "main.h" #define EXPEDITE_CXX_TEST_IMPL +#include /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +28,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(0), @@ -40,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -58,7 +59,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc index 0b2b644..6455637 100644 --- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc @@ -18,7 +18,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(0), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -59,7 +59,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc index c3944db..5798ea8 100644 --- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc @@ -18,7 +18,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(0), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -59,7 +59,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc index 82251f5..0776f29 100644 --- a/src/bin/cxx/image_blend_occlude1.cc +++ b/src/bin/cxx/image_blend_occlude1.cc @@ -18,7 +18,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -29,7 +29,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -56,7 +56,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -74,7 +74,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc index 6cfcf2e..2b6ab47 100644 --- a/src/bin/cxx/image_blend_occlude1_few.cc +++ b/src/bin/cxx/image_blend_occlude1_few.cc @@ -21,7 +21,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -32,7 +32,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL)); @@ -59,7 +59,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -77,7 +77,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc index 17f69fb..9ce7288 100644 --- a/src/bin/cxx/image_blend_occlude1_many.cc +++ b/src/bin/cxx/image_blend_occlude1_many.cc @@ -21,7 +21,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -32,7 +32,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -59,7 +59,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -77,7 +77,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc index f54193d..e1c439a 100644 --- a/src/bin/cxx/image_blend_occlude1_very_many.cc +++ b/src/bin/cxx/image_blend_occlude1_very_many.cc @@ -23,7 +23,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -34,7 +34,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -61,7 +61,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -79,7 +79,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc index e1c28c6..5192e93 100644 --- a/src/bin/cxx/image_blend_occlude2.cc +++ b/src/bin/cxx/image_blend_occlude2.cc @@ -20,7 +20,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -58,7 +58,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -76,7 +76,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc index f757e08..b75eb59 100644 --- a/src/bin/cxx/image_blend_occlude2_few.cc +++ b/src/bin/cxx/image_blend_occlude2_few.cc @@ -23,7 +23,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -34,7 +34,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -61,7 +61,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -79,7 +79,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc index 86fcb18..be055ae 100644 --- a/src/bin/cxx/image_blend_occlude2_many.cc +++ b/src/bin/cxx/image_blend_occlude2_many.cc @@ -23,7 +23,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -34,7 +34,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -61,7 +61,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -79,7 +79,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc index fa96c23..5f4c830 100644 --- a/src/bin/cxx/image_blend_occlude2_very_many.cc +++ b/src/bin/cxx/image_blend_occlude2_very_many.cc @@ -23,7 +23,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -34,7 +34,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -61,7 +61,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -79,7 +79,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc index bcddd8d..a118116 100644 --- a/src/bin/cxx/image_blend_occlude3.cc +++ b/src/bin/cxx/image_blend_occlude3.cc @@ -20,7 +20,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -58,7 +58,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -76,7 +76,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc index 8920eb6..e842d9c 100644 --- a/src/bin/cxx/image_blend_occlude3_few.cc +++ b/src/bin/cxx/image_blend_occlude3_few.cc @@ -23,7 +23,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -34,7 +34,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -61,7 +61,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -79,7 +79,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc index 279bf5d..20ac9e1 100644 --- a/src/bin/cxx/image_blend_occlude3_many.cc +++ b/src/bin/cxx/image_blend_occlude3_many.cc @@ -21,7 +21,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -32,7 +32,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -59,7 +59,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -77,7 +77,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc index d4aa5f8..1961938 100644 --- a/src/bin/cxx/image_blend_occlude3_very_many.cc +++ b/src/bin/cxx/image_blend_occlude3_very_many.cc @@ -22,7 +22,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -33,7 +33,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); @@ -60,7 +60,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -78,7 +78,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc index 5177840..5e9dee7 100644 --- a/src/bin/cxx/image_blend_smooth_same_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc @@ -19,7 +19,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -29,7 +29,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -60,7 +60,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc index d5eedce..9c4f3bf 100644 --- a/src/bin/cxx/image_blend_smooth_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_scaled.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), @@ -40,7 +40,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -58,7 +58,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc index 620d561..f4bf8fe 100644 --- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(1), @@ -40,7 +40,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -58,7 +58,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc index ec076ff..cb8b75e 100644 --- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(1), @@ -40,7 +40,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -58,7 +58,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc index 012b824..013be0f 100644 --- a/src/bin/cxx/image_blend_solid_middle_border.cc +++ b/src/bin/cxx/image_blend_solid_middle_border.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("bar.png"), NULL), evas_obj_image_border_set(6, 6, 6, 6), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -59,7 +59,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); diff --git a/src/bin/cxx/image_blend_solid_middle_unscaled.cc b/src/bin/cxx/image_blend_solid_middle_unscaled.cc index 573b354..3147a44 100644 --- a/src/bin/cxx/image_blend_solid_middle_unscaled.cc +++ b/src/bin/cxx/image_blend_solid_middle_unscaled.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -59,7 +59,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc index e3259e7..fe7f275 100644 --- a/src/bin/cxx/image_blend_unscaled.cc +++ b/src/bin/cxx/image_blend_unscaled.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -57,7 +57,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/cxx/image_crossfade.cc b/src/bin/cxx/image_crossfade.cc index e871ce7..68b8d63 100644 --- a/src/bin/cxx/image_crossfade.cc +++ b/src/bin/cxx/image_crossfade.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[2]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -26,7 +26,7 @@ static void _setup(void) Evas_Object *o; o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[0] = o; + images[0] = o; eo_do(o, efl_file_set(build_path("im1.png"), NULL), evas_obj_image_fill_set(0, 0, 720, 420), @@ -34,7 +34,7 @@ static void _setup(void) evas_obj_visibility_set(EINA_TRUE)); o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[1] = o; + images[1] = o; eo_do(o, efl_file_set(build_path("im2.png"), NULL), evas_obj_image_fill_set(0, 0, 720, 420), @@ -48,7 +48,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 2; i++) eo_del(o_images[i]); + for (i = 0; i < 2; i++) eo_del(images[i]); } /* loop - do things */ @@ -58,7 +58,7 @@ static void _loop(double t, int f) a = f & 0x1f; a = ((a << 3) | (a >> 2)) & 0xff; - eo_do(o_images[1], evas_obj_color_set(a, a, a, a)); + eo_do(images[1], evas_obj_color_set(a, a, a, a)); FPS_STD(NAME); } diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc index 7c3ca78..45cae0e 100644 --- a/src/bin/cxx/image_data_argb.cc +++ b/src/bin/cxx/image_data_argb.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); } /* loop - do things */ @@ -61,7 +61,7 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h), @@ -78,7 +78,7 @@ static void _loop(double t, int f) } p += (st - w); } - eo_do(o_images[i], + eo_do(images[i], evas_obj_image_data_set(data), evas_obj_image_data_update_add( 0, 0, w, h)); } diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc index f2cde92..0325fd8 100644 --- a/src/bin/cxx/image_data_argb_alpha.cc +++ b/src/bin/cxx/image_data_argb_alpha.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); } /* loop - do things */ @@ -61,7 +61,7 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h), @@ -89,7 +89,7 @@ static void _loop(double t, int f) } p += (st - w); } - eo_do(o_images[i], + eo_do(images[i], evas_obj_image_data_set(data), evas_obj_image_data_update_add( 0, 0, w, h)); } diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc index 70c3736..3f4da71 100644 --- a/src/bin/cxx/image_data_ycbcr601pl.cc +++ b/src/bin/cxx/image_data_ycbcr601pl.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; static unsigned char *yp = NULL, *up = NULL, *vp = NULL; /* setup */ @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), @@ -51,7 +51,7 @@ static void _setup(void) fread(vp, 320 * 240, 1, f); fclose(f); } - data = evas_object_image_data_get(o_images[i], 1); + data = evas_object_image_data_get(images[i], 1); lp = data; for (y = 0; y < 480; y++) { @@ -68,7 +68,7 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - eo_do(o_images[i], evas_obj_image_data_set(data)); + eo_do(images[i], evas_obj_image_data_set(data)); } done = 0; } @@ -77,7 +77,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); free(yp); free(up); free(vp); @@ -94,7 +94,7 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h), diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc index 1013307..cbdf811 100644 --- a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; static unsigned char *yp = NULL, *up = NULL, *vp = NULL; /* setup */ @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), @@ -52,7 +52,7 @@ static void _setup(void) fread(vp, 320 * 240, 1, f); fclose(f); } - data = evas_object_image_data_get(o_images[i], 1); + data = evas_object_image_data_get(images[i], 1); lp = data; for (y = 0; y < 480; y++) { @@ -69,7 +69,7 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - eo_do(o_images[i], evas_obj_image_data_set(data)); + eo_do(images[i], evas_obj_image_data_set(data)); } done = 0; } @@ -78,7 +78,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); free(yp); free(up); free(vp); @@ -103,7 +103,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc index f1f76ac..fc37d05 100644 --- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc +++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; static unsigned char *yp = NULL, *up = NULL, *vp = NULL; /* setup */ @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), @@ -51,7 +51,7 @@ static void _setup(void) fread(vp, 320 * 240, 1, f); fclose(f); } - data = evas_object_image_data_get(o_images[i], 1); + data = evas_object_image_data_get(images[i], 1); lp = data; for (y = 0; y < 480; y++) { @@ -68,7 +68,7 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - eo_do(o_images[i], evas_obj_image_data_set(data)); + eo_do(images[i], evas_obj_image_data_set(data)); } done = 0; } @@ -77,7 +77,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); free(yp); free(up); free(vp); @@ -101,7 +101,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc index 40f1517..41f3f0f 100644 --- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc +++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; static unsigned char *yp = NULL, *up = NULL, *vp = NULL; /* setup */ @@ -31,7 +31,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), @@ -51,7 +51,7 @@ static void _setup(void) fread(vp, 320 * 240, 1, f); fclose(f); } - data = evas_object_image_data_get(o_images[i], 1); + data = evas_object_image_data_get(images[i], 1); if (data) { lp = data; @@ -70,7 +70,7 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - eo_do(o_images[i], + eo_do(images[i], evas_obj_image_data_set(data), evas_obj_image_data_update_add( 0, 0, 320, 480)); } @@ -82,7 +82,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); free(yp); free(up); free(vp); @@ -101,7 +101,7 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); @@ -112,8 +112,8 @@ static void _loop(double t, int f) w &= ~0x1; - eo_do(o_images[i], evas_obj_image_size_set(w, 480)); - data = evas_object_image_data_get(o_images[i], 1); + eo_do(images[i], evas_obj_image_size_set(w, 480)); + data = evas_object_image_data_get(images[i], 1); if (data) { lp = data; @@ -132,7 +132,7 @@ static void _loop(double t, int f) *lp = vp + (y * 320); lp++; } - eo_do(o_images[i], + eo_do(images[i], evas_obj_image_data_set(data), evas_obj_image_data_update_add( 0, 0, w, 480)); } diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc index 56b31ea..a243206 100644 --- a/src/bin/cxx/image_map_3d_flow.cc +++ b/src/bin/cxx/image_map_3d_flow.cc @@ -20,7 +20,7 @@ static int done = 0; #define CNUM 48 /* private data */ -static Evas_Object *o_images[CNUM]; +static efl::eina::list images; static Evas_Object *o_reflec[CNUM]; /* setup */ @@ -33,7 +33,7 @@ static void _setup(void) char buf[256]; o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); eo_do(o, efl_file_set(build_path(buf), NULL), @@ -61,7 +61,7 @@ static void _cleanup(void) int i; for (i = 0; i < CNUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_reflec[i]); } } @@ -133,12 +133,12 @@ static void _loop(double t, int f) if (c <= 0) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); eo_do(o_reflec[i], evas_obj_raise()); } else { - eo_do(o_images[i], evas_obj_lower()); + eo_do(images[i], evas_obj_lower()); eo_do(o_reflec[i], evas_obj_lower()); } @@ -162,7 +162,7 @@ static void _loop(double t, int f) x + (w / 2), y + (h / 2), 0); evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); diff --git a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc index b126954..ce9c747 100644 --- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -72,7 +72,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc index d02607e..b302c27 100644 --- a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -72,7 +72,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc index ba9c7d7..66eb5cc 100644 --- a/src/bin/cxx/image_map_color_alpha_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -70,7 +70,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc index 03294a1..9d2884a 100644 --- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -69,7 +69,7 @@ static void _loop(double t, int f) evas_map_point_color_set(m, 3, 0, 0, 0, 0); evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc index 7496a3f..c5002b5 100644 --- a/src/bin/cxx/image_map_color_nearest_rotate.cc +++ b/src/bin/cxx/image_map_color_nearest_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -72,7 +72,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc index 5c4a356..a98dbe1 100644 --- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -72,7 +72,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc index 3e8712b..4f03ef9 100644 --- a/src/bin/cxx/image_map_color_rotate.cc +++ b/src/bin/cxx/image_map_color_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -70,7 +70,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc index 490dcee..f65db76 100644 --- a/src/bin/cxx/image_map_color_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -70,7 +70,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc index 098dd8f..d4ffd45 100644 --- a/src/bin/cxx/image_map_nearest_rotate.cc +++ b/src/bin/cxx/image_map_nearest_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -67,7 +67,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc index 52192cc..19c7ef4 100644 --- a/src/bin/cxx/image_map_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -67,7 +67,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc index d21c624..13631df 100644 --- a/src/bin/cxx/image_map_rotate.cc +++ b/src/bin/cxx/image_map_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_size_set(120, 160), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -64,7 +64,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], evas_obj_map_enable_set(1), + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } FPS_STD(NAME); diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc index 3c5f740..41cc9c0 100644 --- a/src/bin/cxx/image_map_solid_rotate.cc +++ b/src/bin/cxx/image_map_solid_rotate.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < (OBNUM / 2); i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); } /* loop - do things */ @@ -65,7 +65,7 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - eo_do(o_images[i], + eo_do(images[i], evas_obj_map_enable_set(1), evas_obj_map_set(m)); } diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc index dc919e6..a322042 100644 --- a/src/bin/cxx/image_quality_scale.cc +++ b/src/bin/cxx/image_quality_scale.cc @@ -18,7 +18,7 @@ static int done = 0; /* private data */ -static Evas_Object *o_images[1]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -28,7 +28,7 @@ static void _setup(void) for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path("tp.png"), NULL), evas_obj_image_fill_set(0, 0, 640, 480), evas_obj_size_set(640, 480), @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_del(images[i]); } /* loop - do things */ @@ -57,7 +57,7 @@ static void _loop(double t, int f) h *= (f / 100.0) * 4.0; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y), + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h), evas_obj_image_fill_set(0, 0, w, h)); } diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc index d55673a..eda881d 100644 --- a/src/bin/cxx/line_blend.cc +++ b/src/bin/cxx/line_blend.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -30,7 +30,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_LINE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = (rnd()&0xff) / 2; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; @@ -52,7 +52,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } #define PI (double) 3.141592654 @@ -93,7 +93,7 @@ static void _loop(double t, int f) for (i = 0; i < OBNUM; i++) { - o = o_images[i]; + o = images[i]; eo_do(o, evas_obj_line_xy_get(&ox1, &oy1, &ox2, &oy2)); _rotate_point(&ox1, &oy1, i); diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc index ddb9797..a316876 100644 --- a/src/bin/cxx/proxy_image.cc +++ b/src/bin/cxx/proxy_image.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -32,12 +32,12 @@ static void _setup(void) evas_obj_size_set(120, 160), evas_obj_visibility_set(EINA_TRUE)); src = o; - o_images[0] = src; + images[0] = src; for (i = 1; i < OBNUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_source_set(src), evas_obj_size_set(120, 160), @@ -51,7 +51,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -67,7 +67,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc index 04130f9..bf17151 100644 --- a/src/bin/cxx/proxy_image_offscreen.cc +++ b/src/bin/cxx/proxy_image_offscreen.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -35,7 +35,7 @@ static void _setup(void) for (i = 0; i < OBNUM / 2; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_source_set(src, NULL), evas_obj_size_set(120, 160), evas_obj_image_fill_set(0,0,120,160), @@ -48,7 +48,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -64,7 +64,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/cxx/rect_blend.cc b/src/bin/cxx/rect_blend.cc index 06f3644..6e2dcce 100644 --- a/src/bin/cxx/rect_blend.cc +++ b/src/bin/cxx/rect_blend.cc @@ -14,7 +14,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = rnd()&0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -61,7 +61,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h)); } diff --git a/src/bin/cxx/rect_blend_few.cc b/src/bin/cxx/rect_blend_few.cc index 9ceb71b..181683c 100644 --- a/src/bin/cxx/rect_blend_few.cc +++ b/src/bin/cxx/rect_blend_few.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -30,7 +30,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = rnd()&0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -63,7 +63,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], evas_obj_position_set(x, y), + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h)); } FPS_STD(NAME); diff --git a/src/bin/cxx/rect_blend_pow2.cc b/src/bin/cxx/rect_blend_pow2.cc index 5d34a52..8ba5fb0 100644 --- a/src/bin/cxx/rect_blend_pow2.cc +++ b/src/bin/cxx/rect_blend_pow2.cc @@ -14,7 +14,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; r = ((rnd()&0xff) * a) / 255; @@ -44,7 +44,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -62,7 +62,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h)); } diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc index 53d0e9e..67a270a 100644 --- a/src/bin/cxx/rect_blend_pow2_few.cc +++ b/src/bin/cxx/rect_blend_pow2_few.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -30,7 +30,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; r = ((rnd()&0xff) * a) / 255; @@ -46,7 +46,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -64,7 +64,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], evas_obj_position_set(x, y), + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h)); } FPS_STD(NAME); diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc index a4df617..fd32d05 100644 --- a/src/bin/cxx/rect_solid.cc +++ b/src/bin/cxx/rect_solid.cc @@ -14,7 +14,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -27,7 +27,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = 0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -61,7 +61,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h)); } diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc index ebfd495..0a46888 100644 --- a/src/bin/cxx/rect_solid_few.cc +++ b/src/bin/cxx/rect_solid_few.cc @@ -17,7 +17,7 @@ /* standard var */ static int done = 0; /* private data */ -static Evas_Object *o_images[OBNUM]; +static efl::eina::list images; /* setup */ static void _setup(void) @@ -30,7 +30,7 @@ static void _setup(void) int r, g, b, a; o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; a = 0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_del(images[i]); } /* loop - do things */ @@ -63,7 +63,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); - eo_do(o_images[i], evas_obj_position_set(x, y), + eo_do(images[i], evas_obj_position_set(x, y), evas_obj_size_set(w, h)); } FPS_STD(NAME); diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc index 34e3d1f..62511fb 100644 --- a/src/bin/cxx/widgets_file_icons.cc +++ b/src/bin/cxx/widgets_file_icons.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -47,7 +47,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -71,7 +71,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -85,7 +85,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc index 82ed0cc..82d0b99 100644 --- a/src/bin/cxx/widgets_file_icons_2.cc +++ b/src/bin/cxx/widgets_file_icons_2.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -47,7 +47,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -69,7 +69,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -83,7 +83,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc index 41e53ba..fa42b7a 100644 --- a/src/bin/cxx/widgets_file_icons_2_grouped.cc +++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -47,7 +47,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -62,12 +62,12 @@ static void _setup(void) } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); } for (i = 0; i < NUM; i++) { if (i > 13) - eo_do(o_images[i], evas_obj_stack_above(o_images[i - 13])); + eo_do(images[i], evas_obj_stack_above(images[i - 13])); } done = 0; } @@ -78,7 +78,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -92,7 +92,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc index a4e9756..a7cf08d 100644 --- a/src/bin/cxx/widgets_file_icons_2_same.cc +++ b/src/bin/cxx/widgets_file_icons_2_same.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -32,7 +32,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -54,7 +54,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -68,7 +68,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); diff --git a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc index e3a8ffb..7596377 100644 --- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc +++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc @@ -1,22 +1,25 @@ -#undef FNAME -#undef NAME -#undef ICON -/* metadata */ -#define FNAME widgets_file_icons_2_same_grouped_start -#define NAME "Widgets File Icons 2 Same Grouped" -#define ICON "widgets.png" +#ifdef HAVE_CONFIG_H +# include +#endif -#ifndef PROTO -# ifndef UI -# include "main.h" +#include "Eo.h" +#include "Evas.h" + +#include "Eo.hh" +#include "Eina.hh" +#include "Evas.hh" + +#include "main.h" + +#define EXPEDITE_CXX_TEST_IMPL /* standard var */ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -32,7 +35,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -47,7 +50,7 @@ static void _setup(void) } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); } done = 0; } @@ -58,7 +61,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -72,7 +75,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); @@ -92,38 +95,8 @@ static void _key(char *key) KEY_STD; } - - - - - - - - - - - -/* template stuff - ignore */ -# endif -#endif - -#ifdef UI -_ui_menu_item_add(ICON, NAME, FNAME); -#endif - -#ifdef PROTO -void FNAME(void); -#endif - -#ifndef PROTO -# ifndef UI -void FNAME(void) +extern "C" void FNAME(void) { ui_func_set(_key, _loop); _setup(); } -# endif -#endif -#undef FNAME -#undef NAME -#undef ICON diff --git a/src/bin/cxx/widgets_file_icons_3.cc b/src/bin/cxx/widgets_file_icons_3.cc index 2ee74ed..cbc9e65 100644 --- a/src/bin/cxx/widgets_file_icons_3.cc +++ b/src/bin/cxx/widgets_file_icons_3.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 16 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -47,7 +47,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -69,7 +69,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -83,7 +83,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc index 7558807..f68a590 100644 --- a/src/bin/cxx/widgets_file_icons_4.cc +++ b/src/bin/cxx/widgets_file_icons_4.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 96 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *icons[] = @@ -47,7 +47,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), @@ -69,7 +69,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -83,7 +83,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); + eo_do(images[i], evas_obj_position_set(x + 8, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc index dd7066e..c128d42 100644 --- a/src/bin/cxx/widgets_list_1.cc +++ b/src/bin/cxx/widgets_list_1.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *labels[] = @@ -63,7 +63,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -86,7 +86,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -100,7 +100,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); diff --git a/src/bin/cxx/widgets_list_1_grouped.cc b/src/bin/cxx/widgets_list_1_grouped.cc index 93c1d83..034a0c5 100644 --- a/src/bin/cxx/widgets_list_1_grouped.cc +++ b/src/bin/cxx/widgets_list_1_grouped.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *labels[] = @@ -63,7 +63,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -79,7 +79,7 @@ static void _setup(void) } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); } for (i = 0; i < NUM; i++) { @@ -94,7 +94,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -108,7 +108,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc index 9a93e1c..88c3566 100644 --- a/src/bin/cxx/widgets_list_2.cc +++ b/src/bin/cxx/widgets_list_2.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 32 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *labels[] = @@ -63,7 +63,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -86,7 +86,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -100,7 +100,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc index b9ea16b..b315af3 100644 --- a/src/bin/cxx/widgets_list_2_grouped.cc +++ b/src/bin/cxx/widgets_list_2_grouped.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_texts[NUM]; static const char *labels[] = @@ -63,7 +63,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -79,7 +79,7 @@ static void _setup(void) } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); } for (i = 0; i < NUM; i++) { @@ -94,7 +94,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_texts[i]); } } @@ -108,7 +108,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); diff --git a/src/bin/cxx/widgets_list_3.cc b/src/bin/cxx/widgets_list_3.cc index c655b84..677a234 100644 --- a/src/bin/cxx/widgets_list_3.cc +++ b/src/bin/cxx/widgets_list_3.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_icons[NUM]; static Evas_Object *o_texts[NUM]; @@ -84,7 +84,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -115,7 +115,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_icons[i]); eo_del(o_texts[i]); } @@ -130,7 +130,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; diff --git a/src/bin/cxx/widgets_list_3_grouped.cc b/src/bin/cxx/widgets_list_3_grouped.cc index 28b92b7..b1b36ca 100644 --- a/src/bin/cxx/widgets_list_3_grouped.cc +++ b/src/bin/cxx/widgets_list_3_grouped.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 64 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_icons[NUM]; static Evas_Object *o_texts[NUM]; @@ -84,7 +84,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -108,7 +108,7 @@ static void _setup(void) } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); } for (i = 0; i < NUM; i++) { @@ -132,7 +132,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_icons[i]); eo_del(o_texts[i]); } @@ -147,7 +147,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc index a624af9..4d146a3 100644 --- a/src/bin/cxx/widgets_list_4.cc +++ b/src/bin/cxx/widgets_list_4.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 32 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_icons[NUM]; static Evas_Object *o_texts[NUM]; @@ -84,7 +84,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -113,7 +113,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < NUM; i++) eo_del(o_images[i]); + for (i = 0; i < NUM; i++) eo_del(images[i]); for (i = 0; i < NUM; i++) eo_del(o_icons[i]); for (i = 0; i < NUM; i++) eo_del(o_texts[i]); } @@ -127,7 +127,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; diff --git a/src/bin/cxx/widgets_list_4_grouped.cc b/src/bin/cxx/widgets_list_4_grouped.cc index 9b3166f..7dc8649 100644 --- a/src/bin/cxx/widgets_list_4_grouped.cc +++ b/src/bin/cxx/widgets_list_4_grouped.cc @@ -16,7 +16,7 @@ static int done = 0; /* private data */ #define NUM 512 #define ICON_SIZE 32 -static Evas_Object *o_images[NUM]; +static efl::eina::list images; static Evas_Object *o_icons[NUM]; static Evas_Object *o_texts[NUM]; @@ -84,7 +84,7 @@ static void _setup(void) for (i = 0; i < NUM; i++) { o = eo_add(EVAS_IMAGE_CLASS, G_evas); - o_images[i] = o; + images[i] = o; eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), @@ -108,7 +108,7 @@ static void _setup(void) } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(images[i], evas_obj_raise()); } for (i = 0; i < NUM; i++) { @@ -131,7 +131,7 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); + eo_del(images[i]); eo_del(o_icons[i]); eo_del(o_texts[i]); } @@ -146,7 +146,7 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(images[i], evas_obj_position_set(x, y)); eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2;