summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-16 13:01:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-16 13:10:34 +0900
commit2d995fdedc6ac67bb9b7fabb38a7b4e1b3e663c9 (patch)
tree5bd04d6016fa3edf1715380be79affb994f5f5b4 /src/tests/emotion
parentda1e53820bf1786e2ada9be5e9f9ae7bb0704020 (diff)
tests: Use EO_CALLBACKS_ARRAY_DEFINE in all tests
This should make them work on Windows, too.
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index f5b6702d5f..c5adbe1715 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -597,7 +597,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
597 } 597 }
598} 598}
599 599
600static const Eo_Callback_Array_Item emotion_object_test_callbacks[] = { 600EO_CALLBACKS_ARRAY_DEFINE(emotion_object_test_callbacks,
601 { EMOTION_OBJECT_EVENT_FRAME_DECODE, video_obj_frame_decode_cb }, 601 { EMOTION_OBJECT_EVENT_FRAME_DECODE, video_obj_frame_decode_cb },
602 { EMOTION_OBJECT_EVENT_FRAME_RESIZE, video_obj_frame_resize_cb }, 602 { EMOTION_OBJECT_EVENT_FRAME_RESIZE, video_obj_frame_resize_cb },
603 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, video_obj_length_change_cb }, 603 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, video_obj_length_change_cb },
@@ -608,9 +608,8 @@ static const Eo_Callback_Array_Item emotion_object_test_callbacks[] = {
608 { EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, video_obj_progress_cb }, 608 { EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, video_obj_progress_cb },
609 { EMOTION_OBJECT_EVENT_REF_CHANGE, video_obj_ref_cb }, 609 { EMOTION_OBJECT_EVENT_REF_CHANGE, video_obj_ref_cb },
610 { EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, video_obj_button_num_cb }, 610 { EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, video_obj_button_num_cb },
611 { EMOTION_OBJECT_EVENT_BUTTON_CHANGE, video_obj_button_cb }, 611 { EMOTION_OBJECT_EVENT_BUTTON_CHANGE, video_obj_button_cb }
612 { NULL, NULL } 612);
613};
614 613
615static void 614static void
616init_video_object(const char *module_filename, const char *filename) 615init_video_object(const char *module_filename, const char *filename)
@@ -653,7 +652,7 @@ init_video_object(const char *module_filename, const char *filename)
653 edje_obj_size_min_calc(oe, &w, &h); 652 edje_obj_size_min_calc(oe, &w, &h);
654 efl_gfx_size_set(oe, w, h); 653 efl_gfx_size_set(oe, w, h);
655 654
656 eo_event_callback_array_add(o, emotion_object_test_callbacks, oe); 655 eo_event_callback_array_add(o, emotion_object_test_callbacks(), oe);
657 656
658 edje_obj_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o); 657 edje_obj_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o);
659 edje_obj_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); 658 edje_obj_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o);