Change the EFL to follow the new Eo rename.
This commit is contained in:
parent
5dcc08f84d
commit
8d31721145
|
@ -201,7 +201,7 @@ static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
|
|||
|
||||
inputs = eina_list_remove(inputs, event->object);
|
||||
ret = ecore_audio_obj_out_input_detach(out, event->object);
|
||||
eo_del(event->object);
|
||||
efl_del(event->object);
|
||||
|
||||
if (!ret)
|
||||
printf("Could not detach input %s\n", name);
|
||||
|
@ -266,7 +266,7 @@ main(int argc, const char *argv[])
|
|||
{
|
||||
if (!strncmp(val, "freq=", 5)) {
|
||||
freq = atoi(&val[5]);
|
||||
eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
|
||||
efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
|
||||
} else if (!strncmp(val, "duration=", 9)) {
|
||||
ecore_audio_obj_in_length_set(in, atof(&val[9]));
|
||||
}
|
||||
|
@ -291,7 +291,7 @@ main(int argc, const char *argv[])
|
|||
continue;
|
||||
}
|
||||
}
|
||||
eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
|
||||
efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
|
||||
inputs = eina_list_append(inputs, in);
|
||||
}
|
||||
|
||||
|
|
|
@ -24,8 +24,8 @@ static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
|
|||
printf("Done: %s\n", name);
|
||||
|
||||
ecore_audio_obj_in_output_get(event->object, &out);
|
||||
eo_del(event->object);
|
||||
eo_del(out);
|
||||
efl_del(event->object);
|
||||
efl_del(out);
|
||||
|
||||
ecore_main_loop_quit();
|
||||
|
||||
|
@ -54,26 +54,26 @@ main(int argc, char *argv[])
|
|||
ret = ecore_audio_obj_source_set(in, argv[1]);
|
||||
if (!ret) {
|
||||
printf("Could not set %s as input\n", argv[1]);
|
||||
eo_del(in);
|
||||
efl_del(in);
|
||||
return 1;
|
||||
}
|
||||
|
||||
eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
|
||||
efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
|
||||
|
||||
out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
|
||||
ret = ecore_audio_obj_source_set(out, argv[2]);
|
||||
if (!ret) {
|
||||
printf("Could not set %s as output\n", argv[2]);
|
||||
eo_del(in);
|
||||
eo_del(out);
|
||||
efl_del(in);
|
||||
efl_del(out);
|
||||
return 1;
|
||||
}
|
||||
|
||||
ret = ecore_audio_obj_out_input_attach(out, in);
|
||||
if (!ret) {
|
||||
printf("Could not attach input\n");
|
||||
eo_del(out);
|
||||
eo_del(in);
|
||||
efl_del(out);
|
||||
efl_del(in);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ void list_files(void *data)
|
|||
const char *path = data;
|
||||
|
||||
Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
|
||||
eo_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Eo_Event_Cb)&filter_cb, NULL);
|
||||
efl_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Efl_Event_Cb)&filter_cb, NULL);
|
||||
promise = efl_io_manager_file_ls(job, path);
|
||||
eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL);
|
||||
eina_promise_then(promise, &done_cb, &error_cb, job);
|
||||
|
|
|
@ -20,7 +20,7 @@ sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
|
|||
|
||||
ecore_main_loop_quit();
|
||||
|
||||
eo_event_callback_stop(event->object);
|
||||
efl_event_callback_stop(event->object);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -28,7 +28,7 @@ monitor_stuff(void *data)
|
|||
{
|
||||
const char *path = data;
|
||||
Eio_Sentry *sentry = eo_add(EIO_SENTRY_CLASS, NULL);
|
||||
eo_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Eo_Event_Cb)&sentry_cb, NULL);
|
||||
efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
|
||||
|
||||
printf("Starting monitoring path %s\n", path);
|
||||
eio_sentry_add(sentry, path);
|
||||
|
|
|
@ -160,7 +160,7 @@ elm_main(int argc, char **argv)
|
|||
vpanes = elm_panes_add(win);
|
||||
_widget_init(vpanes);
|
||||
elm_object_part_content_set(panes, "right", vpanes);
|
||||
eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
|
||||
efl_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
|
||||
|
||||
//listview
|
||||
genlist = elm_genlist_add(win);
|
||||
|
@ -172,7 +172,7 @@ elm_main(int argc, char **argv)
|
|||
_widget_init(genlist);
|
||||
elm_object_part_content_set(vpanes, "left", genlist);
|
||||
|
||||
eo_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv);
|
||||
efl_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv);
|
||||
|
||||
//formview
|
||||
bxr = elm_box_add(win);
|
||||
|
|
|
@ -289,7 +289,7 @@ _change_scene_setup()
|
|||
{
|
||||
evas_canvas3d_node_member_del(globalGraphical.root_node, node);
|
||||
globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node);
|
||||
/*eo_del(node);Unless evas_canvas3d_destructors work properly*/
|
||||
/*efl_del(node);Unless evas_canvas3d_destructors work properly*/
|
||||
}
|
||||
eina_list_free(globalGraphical.list_nodes);
|
||||
eina_list_free(l);
|
||||
|
@ -298,7 +298,7 @@ _change_scene_setup()
|
|||
EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m)
|
||||
{
|
||||
globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m);
|
||||
/*eo_del(m); Unless evas_canvas3d_destructors work properly*/
|
||||
/*efl_del(m); Unless evas_canvas3d_destructors work properly*/
|
||||
}
|
||||
eina_list_free(globalGraphical.list_meshes);
|
||||
eina_list_free(l);
|
||||
|
|
|
@ -62,7 +62,7 @@ main(int argc, const char *argv[])
|
|||
em = emotion_object_add(e);
|
||||
emotion_object_init(em, NULL);
|
||||
|
||||
eo_event_callback_add
|
||||
efl_event_callback_add
|
||||
(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
|
||||
|
||||
emotion_object_file_set(em, filename);
|
||||
|
|
|
@ -30,7 +30,7 @@ _create_emotion_object(Evas *e)
|
|||
|
||||
emotion_object_init(em, "gstreamer1");
|
||||
|
||||
eo_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
|
||||
efl_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
|
||||
|
||||
return em;
|
||||
}
|
||||
|
@ -220,7 +220,7 @@ main(int argc, const char *argv[])
|
|||
|
||||
ecore_evas_data_set(ee, "emotion", em);
|
||||
|
||||
eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
|
||||
efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
|
||||
|
||||
evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
|
||||
evas_object_focus_set(bg, EINA_TRUE);
|
||||
|
|
|
@ -39,9 +39,9 @@ _create_emotion_object(Evas *e)
|
|||
|
||||
emotion_object_init(em, "generic");
|
||||
|
||||
eo_event_callback_add
|
||||
efl_event_callback_add
|
||||
(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
|
||||
eo_event_callback_add
|
||||
efl_event_callback_add
|
||||
(em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL);
|
||||
|
||||
return em;
|
||||
|
@ -207,7 +207,7 @@ main(int argc, const char *argv[])
|
|||
evas_object_resize(em, WIDTH, HEIGHT);
|
||||
evas_object_show(em);
|
||||
|
||||
eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
|
||||
efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
|
||||
|
||||
evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
|
||||
evas_object_focus_set(bg, EINA_TRUE);
|
||||
|
|
|
@ -77,7 +77,7 @@ main(int argc, const char *argv[])
|
|||
if (subtitle_filename)
|
||||
emotion_object_video_subtitle_file_set(em, subtitle_filename);
|
||||
|
||||
eo_event_callback_add
|
||||
efl_event_callback_add
|
||||
(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
|
||||
|
||||
emotion_object_file_set(em, filename);
|
||||
|
|
|
@ -58,7 +58,7 @@ static void
|
|||
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
|
||||
{
|
||||
printf(">>> Emotion object first position update.\n");
|
||||
eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
|
||||
efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
|
||||
_display_info(ev->object);
|
||||
}
|
||||
|
||||
|
@ -66,7 +66,7 @@ static void
|
|||
_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
|
||||
{
|
||||
printf(">>> Emotion object first frame decode.\n");
|
||||
eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
|
||||
efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
|
||||
_display_info(ev->object);
|
||||
}
|
||||
|
||||
|
@ -144,7 +144,7 @@ main(int argc, const char *argv[])
|
|||
fprintf(stderr, "Emotion: \"%s\" module could not be initialized.\n", module);
|
||||
|
||||
_display_info(em);
|
||||
eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
|
||||
efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
|
||||
|
||||
if (!emotion_object_file_set(em, filename))
|
||||
fprintf(stderr, "Emotion: Could not load the file \"%s\"\n", filename);
|
||||
|
|
|
@ -27,7 +27,7 @@ struct _Colourable_Data
|
|||
typedef struct _Colourable_Data Colourable_Data;
|
||||
|
||||
Eo *
|
||||
_ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
|
||||
_ns_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
|
||||
{
|
||||
if(!_ns_colourable_impl_logdomain)
|
||||
{
|
||||
|
@ -35,11 +35,11 @@ _ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
|
|||
= eina_log_domain_register("colourable", EINA_COLOR_BLUE);
|
||||
}
|
||||
DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
|
||||
return eo_constructor(eo_super(obj, MY_CLASS));
|
||||
return efl_constructor(eo_super(obj, MY_CLASS));
|
||||
}
|
||||
|
||||
void
|
||||
_ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
|
||||
_ns_colourable_efl_object_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
|
||||
{
|
||||
if(_ns_colourable_impl_logdomain)
|
||||
{
|
||||
|
@ -47,7 +47,7 @@ _ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
|
|||
_ns_colourable_impl_logdomain = 0;
|
||||
}
|
||||
DBG("_ns_colourable_destructor()\n");
|
||||
eo_destructor(eo_super(obj, MY_CLASS));
|
||||
efl_destructor(eo_super(obj, MY_CLASS));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -13,8 +13,8 @@ struct _Colourable_Data
|
|||
};
|
||||
typedef struct _Colourable_Data Colourable_Data;
|
||||
|
||||
Eo *_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self);
|
||||
void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self);
|
||||
Eo *_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self);
|
||||
void _colourable_efl_object_destructor(Eo *obj, Colourable_Data *self);
|
||||
void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb);
|
||||
void _colourable_print_colour(Eo *obj, Colourable_Data *self);
|
||||
void _colourable_print_colour(Eo *obj, Colourable_Data *self);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
class Ns.Colourable (Eo.Base)
|
||||
class Ns.Colourable (Efl.Object)
|
||||
{
|
||||
[[Colourable class.]]
|
||||
data: Colourable_Data;
|
||||
|
@ -44,8 +44,8 @@ class Ns.Colourable (Eo.Base)
|
|||
}
|
||||
}
|
||||
implements {
|
||||
Eo.Base.constructor;
|
||||
Eo.Base.destructor;
|
||||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
}
|
||||
constructors {
|
||||
.rgb_24bits_constructor;
|
||||
|
|
|
@ -655,14 +655,14 @@ main(void)
|
|||
nodes2 = eina_list_append(nodes2, data.cone.node);
|
||||
|
||||
/*Set callbacks*/
|
||||
eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
|
||||
eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2);
|
||||
efl_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
|
||||
efl_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2);
|
||||
|
||||
eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
|
||||
eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
|
||||
efl_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
|
||||
efl_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
|
||||
|
||||
eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
|
||||
eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
|
||||
efl_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
|
||||
efl_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
|
||||
|
||||
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, &data);
|
||||
evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, &data);
|
||||
|
|
|
@ -204,7 +204,7 @@ vector_set(int x, int y, int w, int h)
|
|||
|
||||
root_node = evas_object_vg_root_node_get(d.vg);
|
||||
// check if the dupe is working properly or not
|
||||
eo_parent_set(beginning, root_node);
|
||||
efl_parent_set(beginning, root_node);
|
||||
|
||||
tmp_vg = root;
|
||||
root = beginning;
|
||||
|
|
Loading…
Reference in New Issue