From f02ff462e7a771ae516202a3b3e3310fd65a6d57 Mon Sep 17 00:00:00 2001 From: Vitor Sousa Date: Mon, 29 Aug 2016 20:13:22 -0300 Subject: [PATCH] efl callbacks: update some events calls to no longer trigger legacy callbacks --- src/benchmarks/eo/eo_bench_callbacks.c | 2 +- src/bin/elementary/test_events.c | 10 ++++---- src/lib/ecore/ecore_exe_posix.c | 2 +- src/lib/ecore/ecore_exe_win32.c | 4 ++-- src/lib/ecore/ecore_idle_enterer.c | 2 +- src/lib/ecore/ecore_idle_exiter.c | 2 +- src/lib/ecore/ecore_idler.c | 2 +- src/lib/ecore/ecore_main.c | 2 +- src/lib/ecore/ecore_timer.c | 2 +- src/lib/ecore/efl_io_closer_fd.c | 2 +- src/lib/ecore/efl_io_copier.c | 24 +++++++++---------- src/lib/ecore/efl_io_file.c | 2 +- src/lib/ecore/efl_io_positioner_fd.c | 2 +- src/lib/ecore/efl_io_reader_fd.c | 4 ++-- src/lib/ecore/efl_io_sizer_fd.c | 2 +- src/lib/ecore/efl_io_writer_fd.c | 2 +- src/lib/ecore/efl_loop_fd.c | 6 ++--- src/lib/ecore_audio/ecore_audio_obj_in.c | 8 +++---- src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | 6 ++--- src/lib/ecore_con/ecore_con.c | 12 +++++----- src/lib/ecore_con/ecore_con_url.c | 6 ++--- src/lib/ecore_con/efl_net_dialer_http.c | 20 ++++++++-------- src/lib/ecore_con/efl_net_dialer_tcp.c | 4 ++-- src/lib/ecore_con/efl_net_server_fd.c | 6 ++--- src/lib/ecore_con/efl_net_server_tcp.c | 6 ++--- src/lib/ector/software/ector_software_buffer.c | 2 +- src/lib/efl/interfaces/efl_io_buffer.c | 28 +++++++++++----------- src/lib/efl/interfaces/efl_io_queue.c | 16 ++++++------- src/lib/efl/interfaces/efl_model_common.c | 4 ++-- src/lib/efl/interfaces/efl_vpath_file.c | 6 ++--- src/lib/eio/eio_model.c | 6 ++--- src/lib/eio/eio_sentry.c | 2 +- src/lib/eldbus/eldbus_model_arguments.c | 2 +- src/lib/eldbus/eldbus_model_connection.c | 2 +- src/lib/eldbus/eldbus_model_method.c | 2 +- src/lib/eldbus/eldbus_model_proxy.c | 4 ++-- src/modules/emotion/libvlc/emotion_libvlc.c | 2 +- src/tests/eolian_cxx/generic.c | 10 ++++---- .../eolian_js/eolian_js_test_test_object_impl.c | 6 ++--- 39 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c index 9cca977..7fd145c3 100644 --- a/src/benchmarks/eo/eo_bench_callbacks.c +++ b/src/benchmarks/eo/eo_bench_callbacks.c @@ -65,7 +65,7 @@ bench_eo_callbacks_call(int request) for (j = 0 ; j < (int) (distribution[i] * request) ; j++) { /* Miss finding the callbacks on purpose, so we measure worst case scenario. */ - efl_event_callback_legacy_call(obj[i], SIMPLE_BAR, NULL); + efl_event_callback_call(obj[i], SIMPLE_BAR, NULL); } } diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index afb794e..4ff26a9 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c @@ -144,14 +144,14 @@ _clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED) efl_input_pointer_position_set(td->evdown, x, y); efl_input_pointer_position_set(td->evup, x, y); - efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove); - efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown); - efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_UP, td->evup); + efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove); + efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown); + efl_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup); } else { - efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown); - efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup); + efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown); + efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup); efl_del(td->evkeydown); efl_del(td->evkeyup); td->evkeydown = NULL; diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c index 49a98f6..5ad60f9 100644 --- a/src/lib/ecore/ecore_exe_posix.c +++ b/src/lib/ecore/ecore_exe_posix.c @@ -1167,7 +1167,7 @@ _ecore_exe_data_generic_handler(void *data, ecore_event_add(event_type, e, _ecore_exe_event_exe_data_free, NULL); - efl_event_callback_legacy_call(obj, eo_event, e); + efl_event_callback_call(obj, eo_event, e); } } } diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c index 44ee08f..e2ef5ac 100644 --- a/src/lib/ecore/ecore_exe_win32.c +++ b/src/lib/ecore/ecore_exe_win32.c @@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data) ecore_event_add(ECORE_EXE_EVENT_DATA, event_data, _ecore_exe_event_exe_data_free, NULL); - efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data); + efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data); } current_buf = NULL; @@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data) ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data, _ecore_exe_event_exe_data_free, NULL); - efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data); + efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data); } current_buf = NULL; diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c index 8ce3c6a..08e7d9d 100644 --- a/src/lib/ecore/ecore_idle_enterer.c +++ b/src/lib/ecore/ecore_idle_enterer.c @@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer) void _ecore_idle_enterer_call(Eo *loop) { - efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL); + efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL); } diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c index 9eb0523..8295af2 100644 --- a/src/lib/ecore/ecore_idle_exiter.c +++ b/src/lib/ecore/ecore_idle_exiter.c @@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter) void _ecore_idle_exiter_call(Eo *loop) { - efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL); + efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL); } diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index e80f9fb..d8eadaa 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -116,7 +116,7 @@ ecore_idler_del(Ecore_Idler *idler) void _ecore_idler_all_call(Eo *loop) { - efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE, NULL); + efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL); } int diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 5191052..ad70d87 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -2873,7 +2873,7 @@ _efl_loop_arguments_send(void *data, void *value EINA_UNUSED) arge.initialization = initialization; initialization = EINA_FALSE; - efl_event_callback_legacy_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge); + efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge); _efl_loop_arguments_cleanup(arga); } diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index f7b9cbd..46efa8a 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -658,7 +658,7 @@ _efl_loop_timer_expired_call(double when) efl_ref(timer->object); eina_evlog("+timer", timer, 0.0, NULL); - efl_event_callback_legacy_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL); + efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL); eina_evlog("-timer", timer, 0.0, NULL); /* may have changed in recursive main loops */ diff --git a/src/lib/ecore/efl_io_closer_fd.c b/src/lib/ecore/efl_io_closer_fd.c index ba648e2..a0ad5ec 100644 --- a/src/lib/ecore/efl_io_closer_fd.c +++ b/src/lib/ecore/efl_io_closer_fd.c @@ -36,7 +36,7 @@ _efl_io_closer_fd_efl_io_closer_close(Eo *o, Efl_Io_Closer_Fd_Data *pd EINA_UNUS efl_io_closer_fd_closer_fd_set(o, -1); if (close(fd) < 0) err = errno; - efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); + efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); return err; } diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c index dbe2ab8..7130619 100644 --- a/src/lib/ecore/efl_io_copier.c +++ b/src/lib/ecore/efl_io_copier.c @@ -81,7 +81,7 @@ _efl_io_copier_job(void *data, void *value EINA_UNUSED) if (pd->destination && efl_io_writer_can_write_get(pd->destination)) _efl_io_copier_write(o, pd); - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); if (!pd->source || efl_io_reader_eos_get(pd->source)) { @@ -89,7 +89,7 @@ _efl_io_copier_job(void *data, void *value EINA_UNUSED) ((!pd->destination) || (eina_binbuf_length_get(pd->buf) == 0))) { pd->done = EINA_TRUE; - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); } } } @@ -125,7 +125,7 @@ _efl_io_copier_dispatch_data_events(Eo *o, Efl_Io_Copier_Data *pd, Eina_Slice sl offset = slice_of_binbuf.bytes - tmp.bytes; - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf); /* user may have modified pd->buf, like calling * efl_io_copier_buffer_limit_set() */ @@ -141,7 +141,7 @@ _efl_io_copier_dispatch_data_events(Eo *o, Efl_Io_Copier_Data *pd, Eina_Slice sl if (pd->line_delimiter.len > 0) { - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf); /* user may have modified pd->buf, like calling * efl_io_copier_buffer_limit_set() */ @@ -191,7 +191,7 @@ _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd) err = efl_io_reader_read(pd->source, &rw_slice); if (err) { - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); return; } @@ -199,7 +199,7 @@ _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd) if (!eina_binbuf_append_slice(pd->buf, ro_slice)) { err = ENOMEM; - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); return; } @@ -262,7 +262,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd) if (err) { if (err != EAGAIN) - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); return; } pd->progress.written += ro_slice.len; @@ -277,7 +277,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd) if (!eina_binbuf_remove(pd->buf, 0, ro_slice.len)) { err = ENOMEM; - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); return; } @@ -320,7 +320,7 @@ _efl_io_copier_source_size_apply(Eo *o, Efl_Io_Copier_Data *pd) if (pd->destination && efl_isa(pd->destination, EFL_IO_SIZER_MIXIN)) efl_io_sizer_resize(pd->destination, pd->progress.total); - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); } static void @@ -424,13 +424,13 @@ _efl_io_copier_destination_closed(void *data, const Efl_Event *event EINA_UNUSED if (!pd->done) { pd->done = EINA_TRUE; - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); } } else { Eina_Error err = EBADF; - efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); } } @@ -601,7 +601,7 @@ _efl_io_copier_efl_io_closer_close(Eo *o, Efl_Io_Copier_Data *pd) } pd->closed = EINA_TRUE; - efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); + efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); if (pd->buf) { diff --git a/src/lib/ecore/efl_io_file.c b/src/lib/ecore/efl_io_file.c index cc5edc9..40c0346 100644 --- a/src/lib/ecore/efl_io_file.c +++ b/src/lib/ecore/efl_io_file.c @@ -46,7 +46,7 @@ _efl_io_file_state_update(Eo *o, Efl_Io_File_Data *pd) if (pd->last_position != pos) { pd->last_position = pos; - efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); } } diff --git a/src/lib/ecore/efl_io_positioner_fd.c b/src/lib/ecore/efl_io_positioner_fd.c index 574e7fa..a1df02f 100644 --- a/src/lib/ecore/efl_io_positioner_fd.c +++ b/src/lib/ecore/efl_io_positioner_fd.c @@ -44,7 +44,7 @@ _efl_io_positioner_fd_efl_io_positioner_seek(Eo *o, Efl_Io_Positioner_Fd_Data *p int fd = efl_io_positioner_fd_positioner_fd_get(o); if (lseek(fd, (off_t)offset, _efl_io_positioner_whence_convert(whence)) < 0) return errno; - efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); return 0; } diff --git a/src/lib/ecore/efl_io_reader_fd.c b/src/lib/ecore/efl_io_reader_fd.c index 8a5ca4f..b5a9427 100644 --- a/src/lib/ecore/efl_io_reader_fd.c +++ b/src/lib/ecore/efl_io_reader_fd.c @@ -78,7 +78,7 @@ _efl_io_reader_fd_efl_io_reader_can_read_set(Eo *o, Efl_Io_Reader_Fd_Data *pd, E EINA_SAFETY_ON_TRUE_RETURN(efl_io_reader_fd_reader_fd_get(o) < 0); if (pd->can_read == can_read) return; pd->can_read = can_read; - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); } EOLIAN static Eina_Bool @@ -94,7 +94,7 @@ _efl_io_reader_fd_efl_io_reader_eos_set(Eo *o, Efl_Io_Reader_Fd_Data *pd, Eina_B if (pd->eos == is_eos) return; pd->eos = is_eos; if (is_eos) - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); } #include "efl_io_reader_fd.eo.c" diff --git a/src/lib/ecore/efl_io_sizer_fd.c b/src/lib/ecore/efl_io_sizer_fd.c index 9e9326a..a57d1a9 100644 --- a/src/lib/ecore/efl_io_sizer_fd.c +++ b/src/lib/ecore/efl_io_sizer_fd.c @@ -31,7 +31,7 @@ _efl_io_sizer_fd_efl_io_sizer_resize(Eo *o, Efl_Io_Sizer_Fd_Data *pd EINA_UNUSED { int fd = efl_io_sizer_fd_sizer_fd_get(o); if (ftruncate(fd, size) < 0) return errno; - efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); return 0; } diff --git a/src/lib/ecore/efl_io_writer_fd.c b/src/lib/ecore/efl_io_writer_fd.c index 9e1b291..dac739b 100644 --- a/src/lib/ecore/efl_io_writer_fd.c +++ b/src/lib/ecore/efl_io_writer_fd.c @@ -82,7 +82,7 @@ _efl_io_writer_fd_efl_io_writer_can_write_set(Eo *o, Efl_Io_Writer_Fd_Data *pd, EINA_SAFETY_ON_TRUE_RETURN(efl_io_writer_fd_writer_fd_get(o) < 0); if (pd->can_write == can_write) return; pd->can_write = can_write; - efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); } #include "efl_io_writer_fd.eo.c" diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c index b04e77d..d1406e7 100644 --- a/src/lib/ecore/efl_loop_fd.c +++ b/src/lib/ecore/efl_loop_fd.c @@ -31,15 +31,15 @@ _efl_loop_fd_read_cb(void *data, Ecore_Fd_Handler *fd_handler) if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) { - efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_READ, NULL); + efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL); } if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) { - efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL); + efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL); } if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR)) { - efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL); + efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL); } return ECORE_CALLBACK_RENEW; diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c index c4af7c4..ff8bd5b 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in.c @@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double obj->speed = speed; - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); } EOLIAN static double @@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i { obj->samplerate = samplerate; - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); } EOLIAN static int @@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); if (len_read == 0) { if (!obj->looped || !obj->seekable) { - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); } else { ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET); len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); } } diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c index edbbb19..676d72d 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c @@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED) if (state == PA_CONTEXT_READY) { DBG("PA context ready."); EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); } } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) { DBG("PA context fail."); EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); } } else { DBG("Connection state %i", state); @@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED) } // the callback here can delete things in the list.. EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); + efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); } // now unref everything safely EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index f6369e5..8340c3d 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj) if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE; ecore_event_add(ev, e, _ecore_con_event_server_add_free, NULL); - efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); + efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); _ecore_con_event_count++; } @@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num, Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; event_info.data = e->data; event_info.size = e->size; - efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); + efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); } _ecore_con_event_count++; } @@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj) if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE; ecore_event_add(ev, e, (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server); - efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); + efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); _ecore_con_event_count++; } @@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; event_info.data = e->data; event_info.size = e->size; - efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); + efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); } _ecore_con_event_count++; } @@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl DBG("%s", error); svr->event_count = eina_list_append(svr->event_count, e); ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL); - efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); + efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); _ecore_con_event_count++; } @@ -1286,7 +1286,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error) cl->event_count = eina_list_append(cl->event_count, e); host_server->event_count = eina_list_append(host_server->event_count, e); ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server); - efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); + efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); _ecore_con_event_count++; } diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index 7fbd0c7..5da1847 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -1140,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg) e.status = status; e.url_con = url_obj; url_con->event_count++; - efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e); + efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e); } static void @@ -1201,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp) e.size = real_size; e.data = buffer; url_con->event_count++; - efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e); + efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e); } else { @@ -1260,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u e.up.total = ultotal; e.up.now = ulnow; url_con->event_count++; - efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e); + efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e); return 0; } diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c index 8b34b75..636a0f3 100644 --- a/src/lib/ecore_con/efl_net_dialer_http.c +++ b/src/lib/ecore_con/efl_net_dialer_http.c @@ -254,7 +254,7 @@ _efl_net_dialer_http_curlm_check(Efl_Net_Dialer_Http_Curlm *cm) DBG("HTTP dialer=%p error: #%d '%s'", dialer, err, eina_error_msg_get(err)); pd->error = err; - efl_event_callback_legacy_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err); + efl_event_callback_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err); } if (msg->msg != CURLMSG_DONE) continue; @@ -765,7 +765,7 @@ _efl_net_dialer_http_headers_done(Eo *o, Efl_Net_Dialer_Http_Data *pd) efl_net_dialer_http_response_content_type_set(o, s); pd->pending_headers_done = EINA_FALSE; - efl_event_callback_legacy_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL); + efl_event_callback_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL); } /* take data from internal buffer filled with efl_io_writer_write() @@ -1121,7 +1121,7 @@ _efl_net_dialer_http_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Http_Dat * allow_redirects will trigger more than once */ pd->connected = connected; - if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); + if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); } EOLIAN static Eina_Bool @@ -1185,7 +1185,7 @@ EOLIAN static void _efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address) { if (eina_stringshare_replace(&pd->address_remote, address)) - efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); + efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); } EOLIAN static const char * @@ -1248,7 +1248,7 @@ _efl_net_dialer_http_efl_io_reader_can_read_set(Eo *o, Efl_Net_Dialer_Http_Data EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (pd->can_read == can_read) return; pd->can_read = can_read; - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); } EOLIAN static Eina_Bool @@ -1265,7 +1265,7 @@ _efl_net_dialer_http_efl_io_reader_eos_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, pd->eos = is_eos; if (is_eos) pd->connected = EINA_FALSE; if (is_eos) - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); } EOLIAN static Eina_Error @@ -1338,7 +1338,7 @@ _efl_net_dialer_http_efl_io_writer_can_write_set(Eo *o, Efl_Net_Dialer_Http_Data EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (pd->can_write == can_write) return; pd->can_write = can_write; - efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); } EOLIAN static Eina_Error @@ -1369,7 +1369,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd) efl_io_reader_eos_set(o, EINA_FALSE); efl_net_dialer_connected_set(o, EINA_FALSE); pd->closed = EINA_TRUE; - efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); + efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); return err; } @@ -1722,7 +1722,7 @@ _efl_net_dialer_http_request_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data pm = _efl_net_dialer_http_primary_mode_effective_get(pd); if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD) - efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); } EOLIAN static int64_t @@ -1742,7 +1742,7 @@ _efl_net_dialer_http_response_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data pm = _efl_net_dialer_http_primary_mode_effective_get(pd); if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD) - efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); } EOLIAN static int64_t diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c index bea0652..88f78fe 100644 --- a/src/lib/ecore_con/efl_net_dialer_tcp.c +++ b/src/lib/ecore_con/efl_net_dialer_tcp.c @@ -115,7 +115,7 @@ _efl_net_dialer_tcp_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Tcp_Data *pd EINA_ if (efl_net_ip_port_fmt(buf, sizeof(buf), (struct sockaddr *)&addr)) { efl_net_socket_address_remote_set(o, buf); - efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); + efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); } fd = efl_net_socket4(addr.ss_family, SOCK_STREAM, IPPROTO_TCP, efl_net_socket_fd_close_on_exec_get(o)); @@ -187,7 +187,7 @@ _efl_net_dialer_tcp_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Tcp_Data { if (pd->connected == connected) return; pd->connected = connected; - if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); + if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); } EOLIAN static Eina_Bool diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c index 505c82c..33448c6 100644 --- a/src/lib/ecore_con/efl_net_server_fd.c +++ b/src/lib/ecore_con/efl_net_server_fd.c @@ -90,7 +90,7 @@ _efl_net_server_fd_event_read(void *data EINA_UNUSED, const Efl_Event *event) { Eina_Error err = errno; ERR("accept(%d): %s", fd, strerror(errno)); - efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); return; } @@ -107,7 +107,7 @@ _efl_net_server_fd_event_error(void *data EINA_UNUSED, const Efl_Event *event) Eina_Error err = EBADF; efl_net_server_serving_set(o, EINA_FALSE); - efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); } EOLIAN static Efl_Object * @@ -205,7 +205,7 @@ _efl_net_server_fd_efl_net_server_serving_set(Eo *o EINA_UNUSED, Efl_Net_Server_ if (pd->serving == serving) return; pd->serving = serving; if (serving) - efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL); + efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL); } EOLIAN static Eina_Error diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c index 6eb04a7..104b913 100644 --- a/src/lib/ecore_con/efl_net_server_tcp.c +++ b/src/lib/ecore_con/efl_net_server_tcp.c @@ -135,7 +135,7 @@ _efl_net_server_tcp_efl_net_server_serve(Eo *o, void *pd EINA_UNUSED, const char error_listen: close(fd); error_socket: - efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); + efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); return err; } @@ -171,7 +171,7 @@ _efl_net_server_tcp_efl_net_server_fd_client_add(Eo *o, void *pd EINA_UNUSED, in } efl_net_server_clients_count_set(o, efl_net_server_clients_count_get(o) + 1); - efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client); + efl_event_callback_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client); if (efl_ref_get(client) == 1) /* users must take a reference themselves */ { @@ -195,7 +195,7 @@ _efl_net_server_tcp_efl_net_server_fd_client_reject(Eo *o, void *pd EINA_UNUSED, efl_net_ip_port_fmt(str, sizeof(str), (struct sockaddr *)&addr); close(client_fd); - efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str); + efl_event_callback_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str); } #include "efl_net_server_tcp.eo.c" diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c index 66c7508..4992063 100644 --- a/src/lib/ector/software/ector_software_buffer.c +++ b/src/lib/ector/software/ector_software_buffer.c @@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat return; } - efl_event_callback_legacy_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8); + efl_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8); if (!pd->nofree) { free(pd->pixels.u8); diff --git a/src/lib/efl/interfaces/efl_io_buffer.c b/src/lib/efl/interfaces/efl_io_buffer.c index 04e5fdf..45f3ef5 100644 --- a/src/lib/efl/interfaces/efl_io_buffer.c +++ b/src/lib/efl/interfaces/efl_io_buffer.c @@ -39,7 +39,7 @@ _efl_io_buffer_realloc(Eo *o, Efl_Io_Buffer_Data *pd, size_t size) /* no efl_io_sizer_size_set() since it could recurse! */ pd->used = size; - efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); } if (size == 0) @@ -55,7 +55,7 @@ _efl_io_buffer_realloc(Eo *o, Efl_Io_Buffer_Data *pd, size_t size) pd->bytes = tmp; pd->allocated = size; - efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); + efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); return EINA_TRUE; } @@ -127,7 +127,7 @@ _efl_io_buffer_binbuf_steal(Eo *o, Efl_Io_Buffer_Data *pd) pd->bytes = NULL; pd->allocated = 0; - efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); + efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); efl_io_sizer_resize(o, 0); return ret; @@ -213,7 +213,7 @@ _efl_io_buffer_efl_io_reader_can_read_set(Eo *o, Efl_Io_Buffer_Data *pd, Eina_Bo EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (pd->can_read == can_read) return; pd->can_read = can_read; - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); } EOLIAN static Eina_Bool @@ -228,7 +228,7 @@ _efl_io_buffer_efl_io_reader_eos_set(Eo *o, Efl_Io_Buffer_Data *pd EINA_UNUSED, { EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (is_eos) - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); } EOLIAN static Eina_Error @@ -273,7 +273,7 @@ _efl_io_buffer_efl_io_writer_write(Eo *o, Efl_Io_Buffer_Data *pd, Eina_Slice *sl if (pd->used < write_pos + todo) { pd->used = write_pos + todo; - efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); efl_io_reader_can_read_set(o, pd->position_read < pd->used); } efl_io_buffer_position_write_set(o, write_pos + todo); @@ -298,7 +298,7 @@ _efl_io_buffer_efl_io_writer_can_write_set(Eo *o, Efl_Io_Buffer_Data *pd, Eina_B EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (pd->can_write == can_write) return; pd->can_write = can_write; - efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); } EOLIAN static Eina_Error @@ -307,7 +307,7 @@ _efl_io_buffer_efl_io_closer_close(Eo *o, Efl_Io_Buffer_Data *pd) EINA_SAFETY_ON_TRUE_RETURN_VAL(efl_io_closer_closed_get(o), EINVAL); efl_io_sizer_resize(o, 0); pd->closed = EINA_TRUE; - efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); + efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); return 0; } @@ -359,9 +359,9 @@ _efl_io_buffer_efl_io_sizer_resize(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t size) efl_io_writer_can_write_set(o, (limit == 0) || (pos_write < limit)); } - efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); if (reallocated) - efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); + efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); return ret; } @@ -437,9 +437,9 @@ _efl_io_buffer_position_read_set(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t positio changed = efl_io_positioner_position_get(o) != position; pd->position_read = position; - efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL); if (changed) - efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); efl_io_reader_can_read_set(o, position < size); efl_io_reader_eos_set(o, position >= size); @@ -469,9 +469,9 @@ _efl_io_buffer_position_write_set(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t positi changed = efl_io_positioner_position_get(o) != position; pd->position_write = position; - efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL); if (changed) - efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); limit = efl_io_buffer_limit_get(o); efl_io_writer_can_write_set(o, (limit == 0) || (position < limit)); diff --git a/src/lib/efl/interfaces/efl_io_queue.c b/src/lib/efl/interfaces/efl_io_queue.c index 2420b86..a4dcf32 100644 --- a/src/lib/efl/interfaces/efl_io_queue.c +++ b/src/lib/efl/interfaces/efl_io_queue.c @@ -180,7 +180,7 @@ _efl_io_queue_limit_set(Eo *o, Efl_Io_Queue_Data *pd, size_t limit) } _efl_io_queue_adjust_and_realloc_if_needed(o, pd); - efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); end: _efl_io_queue_update_cans(o, pd); @@ -216,7 +216,7 @@ _efl_io_queue_clear(Eo *o, Efl_Io_Queue_Data *pd) pd->position_read = 0; pd->position_write = 0; efl_io_reader_can_read_set(o, EINA_FALSE); - efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); if (pd->pending_eos) efl_io_reader_eos_set(o, EINA_TRUE); } @@ -285,7 +285,7 @@ _efl_io_queue_efl_io_reader_read(Eo *o, Efl_Io_Queue_Data *pd, Eina_Rw_Slice *rw pd->position_read += ro_slice.len; efl_io_reader_can_read_set(o, pd->position_read < pd->position_write); - efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); if ((pd->pending_eos) && (efl_io_queue_usage_get(o) == 0)) efl_io_reader_eos_set(o, EINA_TRUE); @@ -309,7 +309,7 @@ _efl_io_queue_efl_io_reader_can_read_set(Eo *o, Efl_Io_Queue_Data *pd, Eina_Bool EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (pd->can_read == can_read) return; pd->can_read = can_read; - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); } EOLIAN static Eina_Bool @@ -327,7 +327,7 @@ _efl_io_queue_efl_io_reader_eos_set(Eo *o, Efl_Io_Queue_Data *pd EINA_UNUSED, Ei if (is_eos) { pd->pending_eos = EINA_FALSE; - efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); + efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); } } @@ -384,7 +384,7 @@ _efl_io_queue_efl_io_writer_write(Eo *o, Efl_Io_Queue_Data *pd, Eina_Slice *slic pd->position_write += todo; _efl_io_queue_adjust_and_realloc_if_needed(o, pd); - efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); _efl_io_queue_update_cans(o, pd); return 0; @@ -407,7 +407,7 @@ _efl_io_queue_efl_io_writer_can_write_set(Eo *o, Efl_Io_Queue_Data *pd, Eina_Boo EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); if (pd->can_write == can_write) return; pd->can_write = can_write; - efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); + efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); } EOLIAN static Eina_Error @@ -417,7 +417,7 @@ _efl_io_queue_efl_io_closer_close(Eo *o, Efl_Io_Queue_Data *pd) efl_io_queue_eos_mark(o); efl_io_queue_clear(o); pd->closed = EINA_TRUE; - efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); + efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); return 0; } diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c index ec433e6..3b32205 100644 --- a/src/lib/efl/interfaces/efl_model_common.c +++ b/src/lib/efl/interfaces/efl_model_common.c @@ -94,7 +94,7 @@ efl_model_property_changed_notify(Efl_Model *model, const char *property) EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; - efl_event_callback_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); + efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); on_error: eina_array_free(changed_properties); @@ -110,7 +110,7 @@ efl_model_property_invalidated_notify(Efl_Model *model, const char *property) EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties}; - efl_event_callback_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); + efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); on_error: eina_array_free(invalidated_properties); diff --git a/src/lib/efl/interfaces/efl_vpath_file.c b/src/lib/efl/interfaces/efl_vpath_file.c index 96887e3..37613fc 100644 --- a/src/lib/efl/interfaces/efl_vpath_file.c +++ b/src/lib/efl/interfaces/efl_vpath_file.c @@ -41,7 +41,7 @@ _efl_vpath_file_do(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd) { if (pd->called) return EINA_FALSE; pd->called = EINA_TRUE; - efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); + efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); return EINA_TRUE; } @@ -52,9 +52,9 @@ _efl_vpath_file_wait(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd EINA_UNUSED) { pd->called = EINA_TRUE; if (pd->result) - efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); + efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); else - efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL); + efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL); } } diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c index be6f094..a7ab949 100644 --- a/src/lib/eio/eio_model.c +++ b/src/lib/eio/eio_model.c @@ -95,7 +95,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED) eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]); evt.changed_properties = properties; - efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); + efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); eina_array_free(properties); } @@ -180,7 +180,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event) eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata); eina_value_flush(&path); - efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt); + efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt); return EINA_TRUE; } @@ -213,7 +213,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event) cevt.index = i; cevt.child = cur->data; - efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt); + efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt); priv->children_list = eina_list_remove_list(priv->children_list, cur); efl_unref(cevt.child); diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c index 153828e..c21b0c2 100644 --- a/src/lib/eio/eio_sentry.c +++ b/src/lib/eio/eio_sentry.c @@ -73,7 +73,7 @@ _handle_event(void *data, int type, void *event) event_info->source = eio_monitor_path_get(monitor_event->monitor); event_info->trigger = monitor_event->filename; - efl_event_callback_legacy_call(pd->object, translated_event, event_info); + efl_event_callback_call(pd->object, translated_event, event_info); // If event was error, we must delete the monitor. if (type == EIO_MONITOR_ERROR) diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c index b784091..f9f7f51 100644 --- a/src/lib/eldbus/eldbus_model_arguments.c +++ b/src/lib/eldbus/eldbus_model_arguments.c @@ -290,7 +290,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd, if (eina_array_count(changed_properties)) { Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; - efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); + efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); } result = EINA_TRUE; diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c index 558cb85..465673a 100644 --- a/src/lib/eldbus/eldbus_model_connection.c +++ b/src/lib/eldbus/eldbus_model_connection.c @@ -341,7 +341,7 @@ _eldbus_model_connection_names_list_cb(void *data, count = eina_list_count(pd->children_list); if (count) - efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count); + efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count); pd->is_listed = EINA_TRUE; diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c index 5adc31b..e36f941 100644 --- a/src/lib/eldbus/eldbus_model_method.c +++ b/src/lib/eldbus/eldbus_model_method.c @@ -95,7 +95,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); if (eldbus_model_arguments_process_arguments(args_data, msg, pending)) - efl_event_callback_legacy_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); + efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); } #include "eldbus_model_method.eo.c" diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c index 0b5ba49..54eb6c6 100644 --- a/src/lib/eldbus/eldbus_model_proxy.c +++ b/src/lib/eldbus/eldbus_model_proxy.c @@ -620,7 +620,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data, .changed_properties = changed_properties }; - efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); + efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); } eina_array_free(changed_properties); @@ -686,7 +686,7 @@ _eldbus_model_proxy_property_set_cb(void *data, .changed_properties = pd->properties_array }; - efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); + efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); efl_model_property_changed_notify(pd->obj, property_set_data->property); } diff --git a/src/modules/emotion/libvlc/emotion_libvlc.c b/src/modules/emotion/libvlc/emotion_libvlc.c index d4fcab3..f994e4d 100644 --- a/src/modules/emotion/libvlc/emotion_libvlc.c +++ b/src/modules/emotion/libvlc/emotion_libvlc.c @@ -280,7 +280,7 @@ evas_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_image_size_get(ev->evas_obj, &w, &h); _emotion_frame_resize(ev->obj, w, h, w / (double) h); - efl_event_callback_legacy_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL); + efl_event_callback_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL); } /* Fetch all libvlc tracks. */ diff --git a/src/tests/eolian_cxx/generic.c b/src/tests/eolian_cxx/generic.c index 8dcf5b6..d7483b3 100644 --- a/src/tests/eolian_cxx/generic.c +++ b/src/tests/eolian_cxx/generic.c @@ -100,23 +100,23 @@ static void _generic_out_optional_ctor_b(Eo *obj EINA_UNUSED, Generic_Data* pd, static void _generic_call_event1(Eo *obj, Generic_Data* pd EINA_UNUSED) { - efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT1, NULL); + efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT1, NULL); } static void _generic_call_event2(Eo *obj, Generic_Data* pd EINA_UNUSED) { - efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT2, obj); + efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT2, obj); } static void _generic_call_event3(Eo *obj, Generic_Data* pd EINA_UNUSED) { int p = 42; - efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT3, &p); + efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT3, &p); } static void _generic_call_event4(Eo *obj, Generic_Data* pd EINA_UNUSED) { int i = 42; Eina_List* p = eina_list_append(NULL, &i); ck_assert(p != NULL); - efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT4, p); + efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT4, p); eina_list_free(p); } static void _generic_call_event5(Eo *obj, Generic_Data* pd EINA_UNUSED) @@ -125,7 +125,7 @@ static void _generic_call_event5(Eo *obj, Generic_Data* pd EINA_UNUSED) Eina_List* p = eina_list_append(NULL, &i); Generic_Event e = {.field1 = 42, .field2 = p}; - efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT5, &e); + efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT5, &e); eina_list_free(p); } static void _generic_protected_method1(Eo *obj EINA_UNUSED, Generic_Data* pd EINA_UNUSED) diff --git a/src/tests/eolian_js/eolian_js_test_test_object_impl.c b/src/tests/eolian_js/eolian_js_test_test_object_impl.c index 63a4a7a..af4acbf 100644 --- a/src/tests/eolian_js/eolian_js_test_test_object_impl.c +++ b/src/tests/eolian_js/eolian_js_test_test_object_impl.c @@ -191,9 +191,9 @@ _test_object_event_emit(Eo* obj, Test_Object_Data *pd EINA_UNUSED) fprintf(stdout, "_test_object_event_emit()\n"); fflush(stdout); static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD}; - efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST, NULL); - efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s); - efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo"); + efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL); + efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s); + efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo"); } EOLIAN static char * -- 2.7.4