summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/tests/emotion
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index f8ed415acd..aaf9ecfa08 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -97,7 +97,7 @@ main_signal_exit(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_
97 EINA_LIST_FREE(video_objs, o) 97 EINA_LIST_FREE(video_objs, o)
98 { 98 {
99 emotion_object_last_position_save(o); 99 emotion_object_last_position_save(o);
100 eo_del(o); 100 efl_del(o);
101 } 101 }
102 return EINA_TRUE; 102 return EINA_TRUE;
103} 103}
@@ -118,7 +118,7 @@ bg_setup(void)
118 efl_gfx_stack_layer_set(o_bg, -999); 118 efl_gfx_stack_layer_set(o_bg, -999);
119 efl_gfx_visible_set(o_bg, EINA_TRUE); 119 efl_gfx_visible_set(o_bg, EINA_TRUE);
120 evas_object_focus_set(o_bg, EINA_TRUE); 120 evas_object_focus_set(o_bg, EINA_TRUE);
121 eo_event_callback_add(o_bg, EFL_EVENT_KEY_DOWN, bg_key_down, NULL); 121 efl_event_callback_add(o_bg, EFL_EVENT_KEY_DOWN, bg_key_down, NULL);
122} 122}
123 123
124static void 124static void
@@ -500,7 +500,7 @@ video_obj_signal_frame_move_start_cb(void *data EINA_UNUSED, Evas_Object *o, con
500 Frame_Data *fd; 500 Frame_Data *fd;
501 Evas_Coord x, y; 501 Evas_Coord x, y;
502 502
503 fd = eo_key_data_get(o, "frame_data"); 503 fd = efl_key_data_get(o, "frame_data");
504 if (!fd) return; 504 if (!fd) return;
505 fd->moving = 1; 505 fd->moving = 1;
506 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 506 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
@@ -514,7 +514,7 @@ video_obj_signal_frame_move_stop_cb(void *data EINA_UNUSED, Evas_Object *o, cons
514{ 514{
515 Frame_Data *fd; 515 Frame_Data *fd;
516 516
517 fd = eo_key_data_get(o, "frame_data"); 517 fd = efl_key_data_get(o, "frame_data");
518 if (!fd) return; 518 if (!fd) return;
519 fd->moving = 0; 519 fd->moving = 0;
520} 520}
@@ -525,7 +525,7 @@ video_obj_signal_frame_resize_start_cb(void *data EINA_UNUSED, Evas_Object *o, c
525 Frame_Data *fd; 525 Frame_Data *fd;
526 Evas_Coord x, y; 526 Evas_Coord x, y;
527 527
528 fd = eo_key_data_get(o, "frame_data"); 528 fd = efl_key_data_get(o, "frame_data");
529 if (!fd) return; 529 if (!fd) return;
530 fd->resizing = 1; 530 fd->resizing = 1;
531 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 531 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
@@ -539,7 +539,7 @@ video_obj_signal_frame_resize_stop_cb(void *data EINA_UNUSED, Evas_Object *o, co
539{ 539{
540 Frame_Data *fd; 540 Frame_Data *fd;
541 541
542 fd = eo_key_data_get(o, "frame_data"); 542 fd = efl_key_data_get(o, "frame_data");
543 if (!fd) return; 543 if (!fd) return;
544 fd->resizing = 0; 544 fd->resizing = 0;
545} 545}
@@ -549,7 +549,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
549{ 549{
550 Frame_Data *fd; 550 Frame_Data *fd;
551 551
552 fd = eo_key_data_get(o, "frame_data"); 552 fd = efl_key_data_get(o, "frame_data");
553 if (!fd) return; 553 if (!fd) return;
554 if (fd->moving) 554 if (fd->moving)
555 { 555 {
@@ -618,8 +618,8 @@ init_video_object(const char *module_filename, const char *filename)
618 if (!fd) exit(1); 618 if (!fd) exit(1);
619 619
620 oe = eo_add(EDJE_OBJECT_CLASS, evas); 620 oe = eo_add(EDJE_OBJECT_CLASS, evas);
621 eo_event_callback_add(oe, EO_EVENT_DEL, _oe_free_cb, fd); 621 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd);
622 eo_key_data_set(oe, "frame_data", fd); 622 efl_key_data_set(oe, "frame_data", fd);
623 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller"); 623 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");
624 edje_object_part_swallow(oe, "video_swallow", o); 624 edje_object_part_swallow(oe, "video_swallow", o);
625 625
@@ -628,7 +628,7 @@ init_video_object(const char *module_filename, const char *filename)
628 edje_obj_size_min_calc(oe, &w, &h); 628 edje_obj_size_min_calc(oe, &w, &h);
629 efl_gfx_size_set(oe, w, h); 629 efl_gfx_size_set(oe, w, h);
630 630
631 eo_event_callback_array_add(o, emotion_object_test_callbacks(), oe); 631 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe);
632 632
633 edje_obj_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o); 633 edje_obj_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o);
634 edje_obj_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); 634 edje_obj_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o);