diff options
Diffstat (limited to 'src/lib/ecore_audio')
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio.c | 4 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj.c | 2 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_in.c | 10 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c | 18 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 14 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_out.c | 16 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c | 8 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | 26 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c | 30 | ||||
| -rw-r--r-- | src/lib/ecore_audio/ecore_audio_sndfile_vio.c | 10 |
10 files changed, 69 insertions, 69 deletions
diff --git a/src/lib/ecore_audio/ecore_audio.c b/src/lib/ecore_audio/ecore_audio.c index 2a104eb36d..f57eca8256 100644 --- a/src/lib/ecore_audio/ecore_audio.c +++ b/src/lib/ecore_audio/ecore_audio.c @@ -37,7 +37,7 @@ ecore_audio_init(void) if (!ecore_init()) return --_ecore_audio_init_count; - if (!eo_init()) { + if (!efl_object_init()) { ecore_shutdown(); return --_ecore_audio_init_count; } @@ -85,7 +85,7 @@ ecore_audio_shutdown(void) eina_log_domain_unregister(_ecore_audio_log_dom); _ecore_audio_log_dom = -1; - eo_shutdown(); + efl_object_shutdown(); ecore_shutdown(); return _ecore_audio_init_count; diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c index 26b34ae4e5..5c7abe2688 100644 --- a/src/lib/ecore_audio/ecore_audio_obj.c +++ b/src/lib/ecore_audio/ecore_audio_obj.c @@ -58,7 +58,7 @@ EOLIAN static Eo * _ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj) { obj->volume = 1.0; - return efl_constructor(eo_super(eo_obj, MY_CLASS)); + return efl_constructor(efl_super(eo_obj, MY_CLASS)); } #include "ecore_audio.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c index 6f20d43bb5..ff8bd5b900 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in.c @@ -98,7 +98,7 @@ EOLIAN static ssize_t _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) { ssize_t len_read = 0; - const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->paused) { memset(buf, 0, len); @@ -124,7 +124,7 @@ EOLIAN static ssize_t _ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len) { ssize_t len_read = 0; - const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->vio && ea_obj->vio->vio->read) { len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len); @@ -151,7 +151,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj) EOLIAN static void _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->vio) _free_vio(ea_obj); @@ -173,7 +173,7 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au EOLIAN static Eo * _ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj) { - eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); obj->speed = 1.0; @@ -186,7 +186,7 @@ _ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj) if(obj->output) ecore_audio_obj_out_input_detach(obj->output, eo_obj); - efl_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(efl_super(eo_obj, MY_CLASS)); } #include "ecore_audio_in.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c index 887ec8b7c0..22ad63d758 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c @@ -49,8 +49,8 @@ _ecore_audio_in_sndfile_ecore_audio_in_seek(Eo *eo_obj EINA_UNUSED, Ecore_Audio_ EOLIAN static Eina_Bool _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); if (!ESF_LOAD()) return EINA_FALSE; if (obj->handle) { @@ -92,14 +92,14 @@ _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfil EOLIAN static const char* _ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->source; } EOLIAN static Eina_Bool _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->source) { ERR("Input is already open - cannot change format"); @@ -131,7 +131,7 @@ _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfil EOLIAN static Ecore_Audio_Format _ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->format;; } @@ -147,8 +147,8 @@ static void _free_vio(Ecore_Audio_Object *ea_obj) EOLIAN static void _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); if (!ESF_LOAD()) return; if (obj->handle) { @@ -201,7 +201,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D EOLIAN static void _ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ESF_LOAD()) return; if (obj->handle) @@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile if (ea_obj->vio) _free_vio(ea_obj); - efl_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(efl_super(eo_obj, MY_CLASS)); } #include "ecore_audio_in_sndfile.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c index a44387b727..0c22edb90e 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c @@ -29,7 +29,7 @@ EOLIAN static ssize_t _ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len) { size_t i, remain; - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); + Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); float *val = data; @@ -50,7 +50,7 @@ EOLIAN static double _ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode) { int tmp; - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); + Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); switch (mode) { case SEEK_SET: @@ -78,7 +78,7 @@ err: EOLIAN static void _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length) { - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); + Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); in_obj->length = length; } @@ -90,7 +90,7 @@ _ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Dat if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { obj->freq = *(int *)val; } else { - efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val); + efl_key_data_set(efl_super(eo_obj, MY_CLASS), key, val); } } @@ -101,16 +101,16 @@ _ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Dat if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { return (void *) (intptr_t) obj->freq; } else { - return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key); + return efl_key_data_get(efl_super(eo_obj, MY_CLASS), key); } } EOLIAN static Eo * _ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj) { - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); + Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); - eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); in_obj->channels = 1; in_obj->samplerate = 44100; diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c index 10e26c5430..7e1d39beca 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out.c @@ -22,8 +22,8 @@ static Eina_Bool _write_cb(void *data) Eo *eo_obj = data; Eo *in; - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); ssize_t written, bread = 0; float buf[1024]; @@ -54,9 +54,9 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input) { Ecore_Audio_Input *in; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); - in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); + in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS); if (in->output == eo_obj) return EINA_FALSE; @@ -81,7 +81,7 @@ _ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input) { Ecore_Audio_Input *in; - in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); + in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS); if (in->output != eo_obj) return EINA_FALSE; @@ -115,7 +115,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj) EOLIAN static void _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->vio) _free_vio(ea_obj); @@ -132,7 +132,7 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN EOLIAN static Eo * _ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj) { - eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); obj->need_writer = EINA_TRUE; @@ -149,7 +149,7 @@ _ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj) ecore_audio_obj_out_input_detach(eo_obj, in); } - efl_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(efl_super(eo_obj, MY_CLASS)); } #include "ecore_audio_out.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c index 91977b80c2..21c21c1ddb 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c @@ -209,7 +209,7 @@ EOLIAN static void _ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, void *sd EINA_UNUSED, double volume) { // TODO Change volume of playing inputs - ecore_audio_obj_volume_set(eo_super(obj, MY_CLASS), volume); + ecore_audio_obj_volume_set(efl_super(obj, MY_CLASS), volume); } EOLIAN static Eina_Bool @@ -220,7 +220,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_ OSStatus err; Eina_Bool chk; - chk = ecore_audio_obj_out_input_attach(eo_super(obj, MY_CLASS), input); + chk = ecore_audio_obj_out_input_attach(efl_super(obj, MY_CLASS), input); if (EINA_UNLIKELY(!chk)) { ERR("Failed to attach input (eo_do_super)"); @@ -312,7 +312,7 @@ free_proc_id: free_helper: free(helper); detach: - ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); + ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input); return_failure: return EINA_FALSE; } @@ -328,7 +328,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_ data = efl_key_data_get(input, "coreaudio_data"); _core_audio_helper_free(data); - ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); + ret = ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input); return ret; } 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 c920f95f89..5adef64a67 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c @@ -52,7 +52,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_ Eina_List *input; uint32_t idx; pa_cvolume pa_volume; - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); if (!EPA_LOAD()) return; if (volume < 0) @@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_ EPA_CALL(pa_cvolume_set)(&pa_volume, 2, volume * PA_VOLUME_NORM); - ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume); + ecore_audio_obj_volume_set(efl_super(eo_obj, MY_CLASS), volume); EINA_LIST_FOREACH(out_obj->inputs, input, in) { stream = efl_key_data_get(in, "pulse_data"); @@ -110,10 +110,10 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) double speed = 0; pa_stream *stream; Eina_Bool ret = EINA_FALSE; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!EPA_LOAD()) return EINA_FALSE; - ret = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); + ret = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in); if (!ret) return EINA_FALSE; @@ -128,7 +128,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) stream = EPA_CALL(pa_stream_new)(class_vars.context, name, &ss, NULL); if (!stream) { ERR("Could not create stream"); - ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); + ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in); return EINA_FALSE; } @@ -184,7 +184,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_ pa_operation *op; if (!EPA_LOAD()) return EINA_FALSE; - ret2 = ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); + ret2 = ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in); if (!ret2) return EINA_FALSE; @@ -214,7 +214,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED) //ref everything in the list to be sure... EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - eo_ref(eo_obj); + efl_ref(eo_obj); } // the callback here can delete things in the list.. if (state == PA_CONTEXT_READY) { @@ -232,7 +232,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED) } // now unref everything safely EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { - eo_unref(eo_obj); + efl_unref(eo_obj); } } @@ -247,7 +247,7 @@ static void _state_job(void *data EINA_UNUSED) DBG("PA context fail."); //ref everything in the list to be sure... EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - eo_ref(eo_obj); + efl_ref(eo_obj); } // the callback here can delete things in the list.. EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { @@ -255,7 +255,7 @@ static void _state_job(void *data EINA_UNUSED) } // now unref everything safely EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { - eo_unref(eo_obj); + efl_unref(eo_obj); } } class_vars.state_job = NULL; @@ -266,10 +266,10 @@ _ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_ { int argc; char **argv; - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); if (!EPA_LOAD()) return NULL; - eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); out_obj->need_writer = EINA_FALSE; @@ -296,7 +296,7 @@ EOLIAN static void _ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) { class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); - efl_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(efl_super(eo_obj, MY_CLASS)); } #include "ecore_audio_out_pulse.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c index fddc898dca..ab8ad7ba62 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c @@ -33,9 +33,9 @@ static Eina_Bool _write_cb(void *data) Eo *eo_obj = data; Eo *in; - Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS); - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Out_Sndfile_Data *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); ssize_t written, bread = 0; float buf[1024]; @@ -63,12 +63,12 @@ static Eina_Bool _write_cb(void *data) EOLIAN static Eina_Bool _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); Eina_Bool ret2 = EINA_FALSE; if (!ESF_LOAD()) return EINA_FALSE; - ret2 = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); + ret2 = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in); if (!ret2) return EINA_FALSE; @@ -80,7 +80,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou if (!obj->handle) { eina_stringshare_del(ea_obj->source); ea_obj->source = NULL; - ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); + ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in); return EINA_FALSE; } @@ -97,7 +97,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou EOLIAN static Eina_Bool _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ESF_LOAD()) return EINA_FALSE; if (obj->handle) { @@ -118,14 +118,14 @@ _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndf EOLIAN static const char* _ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->source; } EOLIAN static Eina_Bool _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->source) { ERR("Input is already open - cannot change format"); @@ -157,16 +157,16 @@ _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndf EOLIAN static Ecore_Audio_Format _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->format; } EOLIAN static Eo * _ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); - eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG); @@ -178,7 +178,7 @@ _ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndf EOLIAN static void _ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj) { - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); if (!ESF_LOAD()) return; if (obj->handle) @@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfi if (out_obj->write_idler) ecore_idler_del(out_obj->write_idler); - efl_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(efl_super(eo_obj, MY_CLASS)); } #include "ecore_audio_out_sndfile.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c index 4a629c8acf..e24a178871 100644 --- a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c +++ b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c @@ -16,7 +16,7 @@ static sf_count_t _wrap_get_filelen(void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -31,7 +31,7 @@ error: static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -46,7 +46,7 @@ error: static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -61,7 +61,7 @@ error: static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -76,7 +76,7 @@ error: static sf_count_t _wrap_tell(void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; |