Fix compilation for git master (1.18-alpha)

This commit is contained in:
Jean-Philippe Andre 2016-07-19 18:21:56 +09:00
parent e79517e490
commit 95d6a6cd9a
117 changed files with 370 additions and 370 deletions

View File

@ -8,7 +8,7 @@ _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
o = evas_object_textblock_add(evas);
efl_gfx_position_set(o, 10, 40);
efl_gfx_size_set(o, win_w - 20, win_h - 50);
efl_gfx_visible_set(o, EINA_TRUE);
@ -21,9 +21,9 @@ _setup(void)
"p='+ font=Vera font_size=10 align=left'"
"/p='- \n \n'"
);
evas_obj_textblock_style_set(o, st);
evas_obj_textblock_clear(o);
evas_obj_textblock_text_markup_set
evas_object_textblock_style_set(o, st);
evas_object_textblock_clear(o);
evas_object_textblock_text_markup_set
(o, "<center>"
"Enlightenment used to be a window manager project, but "
"since has changed a lot to become a miniature desktop and mobile "
@ -60,7 +60,7 @@ _loop(double t EINA_UNUSED,
}
static void
_key(char *key)
_key(const char *key)
{
if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q")))
{

View File

@ -60,7 +60,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
efl_image_border_set(o, 6, 6, 6, 6);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_color_set(o, 64, 64, 64, 255);
@ -63,7 +63,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
@ -64,7 +64,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -24,7 +24,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
efl_file_set(o, build_path("logo.png"), NULL);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -25,7 +25,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < MANYNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
n = rnd() % 100;
w = 3 + ((n * (60 - 3)) / 100);
@ -64,7 +64,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_image_smooth_scale_set(o, 0);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_image_smooth_scale_set(o, 0);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_image_smooth_scale_set(o, 0);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_image_smooth_scale_set(o, 0);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{
@ -75,7 +75,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{
@ -75,7 +75,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{
@ -75,7 +75,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{
@ -78,7 +78,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_image_smooth_scale_set(o, 1);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_image_smooth_scale_set(o, 1);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_image_smooth_scale_set(o, 1);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_image_smooth_scale_set(o, 1);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("frame.png"), NULL);
efl_image_border_set(o, 8, 8, 8, 8);
@ -62,7 +62,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
@ -64,7 +64,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
@ -63,7 +63,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
efl_image_border_set(o, 6, 6, 6, 6);
@ -63,7 +63,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
@ -61,7 +61,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("image.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
@ -59,7 +59,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("logo.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
@ -59,7 +59,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -22,14 +22,14 @@ static void _setup(void)
{
Evas_Object *o;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[0] = o;
efl_file_set(o, build_path("im1.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 720, 420);
efl_gfx_size_set(o, 720, 420);
efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[1] = o;
efl_file_set(o, build_path("im2.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 720, 420);
@ -58,7 +58,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
pixels = malloc(sizeof (int) * 640 * 480);
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
efl_gfx_buffer_alpha_set(o, 0);
@ -91,7 +91,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
pixels = malloc(sizeof (int) * 640 * 480);
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
efl_gfx_buffer_alpha_set(o, 1);
@ -102,7 +102,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
efl_gfx_buffer_alpha_set(o, 0);
@ -104,7 +104,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
efl_gfx_buffer_alpha_set(o, 0);
@ -100,14 +100,14 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
evas_obj_map_enable_set(o_images[i], 1);
evas_obj_map_set(o_images[i], m);
evas_object_map_enable_set(o_images[i], 1);
evas_object_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
efl_gfx_buffer_alpha_set(o, 0);
@ -98,14 +98,14 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
evas_obj_map_enable_set(o_images[i], 1);
evas_obj_map_set(o_images[i], m);
evas_object_map_enable_set(o_images[i], 1);
evas_object_map_set(o_images[i], m);
}
FPS_STD(NAME);
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
efl_gfx_buffer_alpha_set(o, 0);
@ -130,7 +130,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
efl_file_set(o, build_path(buf), NULL);
@ -130,8 +130,8 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
if (evas_map_util_clockwise_get(m))
{
evas_obj_map_enable_set(c->side[i].o, 1);
evas_obj_map_set(c->side[i].o, m);
evas_object_map_enable_set(c->side[i].o, 1);
evas_object_map_set(c->side[i].o, m);
efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
@ -219,7 +219,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
efl_file_set(o, build_path(buf), NULL);
@ -128,8 +128,8 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
if (evas_map_util_clockwise_get(m))
{
evas_obj_map_enable_set(c->side[i].o, 1);
evas_obj_map_set(c->side[i].o, m);
evas_object_map_enable_set(c->side[i].o, 1);
evas_object_map_set(c->side[i].o, m);
efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
@ -217,7 +217,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
efl_file_set(o, build_path(buf), NULL);
@ -128,8 +128,8 @@ _cube_pos(Cube *c,
255, 255, 255,
20, 20, 20);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
evas_obj_map_enable_set(c->side[i].o, 1);
evas_obj_map_set(c->side[i].o, m);
evas_object_map_enable_set(c->side[i].o, 1);
evas_object_map_set(c->side[i].o, m);
order[i] = i;
for (j = 0; j < 4; j++)
@ -211,7 +211,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
efl_file_set(o, build_path(buf), NULL);
@ -126,8 +126,8 @@ _cube_pos(Cube *c,
255, 255, 255,
20, 20, 20);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
evas_obj_map_enable_set(c->side[i].o, 1);
evas_obj_map_set(c->side[i].o, m);
evas_object_map_enable_set(c->side[i].o, 1);
evas_object_map_set(c->side[i].o, m);
order[i] = i;
for (j = 0; j < 4; j++)
@ -209,7 +209,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
efl_file_set(o, build_path(buf), NULL);
@ -130,8 +130,8 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
if (evas_map_util_clockwise_get(m))
{
evas_obj_map_enable_set(c->side[i].o, 1);
evas_obj_map_set(c->side[i].o, m);
evas_object_map_enable_set(c->side[i].o, 1);
evas_object_map_set(c->side[i].o, m);
efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else
@ -199,7 +199,7 @@ static void _loop(double t, int f)
}
/* prepend special key handlers if interactive (before STD) */
static void _key(char *key)
static void _key(const char *key)
{
KEY_STD;
}

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
efl_file_set(o, build_path(buf), NULL);
@ -127,8 +127,8 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
if (evas_map_util_clockwise_get(m))
{
evas_obj_map_enable_set(c->side[i].o, 1);
evas_obj_map_set(c->side[i].o, m);
evas_object_map_enable_set(c->side[i].o, 1);
evas_object_map_set(c->side[i].o, m);
efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
}
else