summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:09 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:10 -0500
commit6326e18b3fb2a4757f8ffa22be5d55a75da23049 (patch)
tree31d586b52638aa0d0b1c759869a8e3368c9daf5d /src/tests/emotion
parent7924660d54500285d3844bfa384394c683825cd9 (diff)
efl.file: improve api a bit
Summary: the previous implementation/api had a number of issues: * "file" property contained both "file" and "key" values - also performed file loading operation * "load_error" property which was specific to image objects * no methods for controlling file loading/unloading this patch attempts the following changes: * split "file" property into "file" and "key" properties - also remove "key" from existing "mmap" property * remove "load_error" * directly return error codes from operations * add "load" and "unload" methods for directly controlling load state * add implicit file loading if file/mmap is set during construction * rewrite all efl.file implementations to move file loading into load() method * rewrite all usage of efl.file api based on these changes * add C extension functions to mimic previous behavior ref T7577 Reviewers: segfaultxavi, bu5hm4n, cedric Reviewed By: segfaultxavi Subscribers: vitor.sousa, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7577 Differential Revision: https://phab.enlightenment.org/D8018
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 65508a0cc5..8304979cf2 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -112,7 +112,7 @@ static void
112bg_setup(void) 112bg_setup(void)
113{ 113{
114 o_bg = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); 114 o_bg = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
115 efl_file_set(o_bg, theme_file, "background"); 115 efl_file_simple_load(o_bg, theme_file, "background");
116 efl_gfx_entity_position_set(o_bg, EINA_POSITION2D(0, 0)); 116 efl_gfx_entity_position_set(o_bg, EINA_POSITION2D(0, 0));
117 efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(startw, starth)); 117 efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(startw, starth));
118 efl_gfx_stack_layer_set(o_bg, -999); 118 efl_gfx_stack_layer_set(o_bg, -999);
@@ -624,7 +624,7 @@ init_video_object(const char *module_filename, const char *filename)
624 oe = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); 624 oe = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
625 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd); 625 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd);
626 efl_key_data_set(oe, "frame_data", fd); 626 efl_key_data_set(oe, "frame_data", fd);
627 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller"); 627 efl_file_simple_load(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");
628 edje_object_part_swallow(oe, "video_swallow", o); 628 edje_object_part_swallow(oe, "video_swallow", o);
629 629
630 offset = 20 * (eina_list_count(video_objs) - 1); 630 offset = 20 * (eina_list_count(video_objs) - 1);