summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/ecore_audio
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r--src/lib/ecore_audio/ecore_audio.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c18
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c14
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c16
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c26
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c30
-rw-r--r--src/lib/ecore_audio/ecore_audio_sndfile_vio.c10
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)
37 if (!ecore_init()) 37 if (!ecore_init())
38 return --_ecore_audio_init_count; 38 return --_ecore_audio_init_count;
39 39
40 if (!eo_init()) { 40 if (!efl_object_init()) {
41 ecore_shutdown(); 41 ecore_shutdown();
42 return --_ecore_audio_init_count; 42 return --_ecore_audio_init_count;
43 } 43 }
@@ -85,7 +85,7 @@ ecore_audio_shutdown(void)
85 eina_log_domain_unregister(_ecore_audio_log_dom); 85 eina_log_domain_unregister(_ecore_audio_log_dom);
86 _ecore_audio_log_dom = -1; 86 _ecore_audio_log_dom = -1;
87 87
88 eo_shutdown(); 88 efl_object_shutdown();
89 ecore_shutdown(); 89 ecore_shutdown();
90 90
91 return _ecore_audio_init_count; 91 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 *
58_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj) 58_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
59{ 59{
60 obj->volume = 1.0; 60 obj->volume = 1.0;
61 return efl_constructor(eo_super(eo_obj, MY_CLASS)); 61 return efl_constructor(efl_super(eo_obj, MY_CLASS));
62} 62}
63 63
64#include "ecore_audio.eo.c" 64#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
98_ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) 98_ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
99{ 99{
100 ssize_t len_read = 0; 100 ssize_t len_read = 0;
101 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 101 const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
102 102
103 if (ea_obj->paused) { 103 if (ea_obj->paused) {
104 memset(buf, 0, len); 104 memset(buf, 0, len);
@@ -124,7 +124,7 @@ EOLIAN static ssize_t
124_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len) 124_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len)
125{ 125{
126 ssize_t len_read = 0; 126 ssize_t len_read = 0;
127 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 127 const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
128 128
129 if (ea_obj->vio && ea_obj->vio->vio->read) { 129 if (ea_obj->vio && ea_obj->vio->vio->read) {
130 len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len); 130 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)
151EOLIAN static void 151EOLIAN static void
152_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) 152_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)
153{ 153{
154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 154 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
155 155
156 if (ea_obj->vio) 156 if (ea_obj->vio)
157 _free_vio(ea_obj); 157 _free_vio(ea_obj);
@@ -173,7 +173,7 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
173EOLIAN static Eo * 173EOLIAN static Eo *
174_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj) 174_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
175{ 175{
176 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 176 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
177 177
178 obj->speed = 1.0; 178 obj->speed = 1.0;
179 179
@@ -186,7 +186,7 @@ _ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
186 if(obj->output) 186 if(obj->output)
187 ecore_audio_obj_out_input_detach(obj->output, eo_obj); 187 ecore_audio_obj_out_input_detach(obj->output, eo_obj);
188 188
189 efl_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(efl_super(eo_obj, MY_CLASS));
190} 190}
191 191
192#include "ecore_audio_in.eo.c" 192#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_
49EOLIAN static Eina_Bool 49EOLIAN static Eina_Bool
50_ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source) 50_ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source)
51{ 51{
52 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 52 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
53 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 53 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
54 54
55 if (!ESF_LOAD()) return EINA_FALSE; 55 if (!ESF_LOAD()) return EINA_FALSE;
56 if (obj->handle) { 56 if (obj->handle) {
@@ -92,14 +92,14 @@ _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
92EOLIAN static const char* 92EOLIAN static const char*
93_ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) 93_ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
94{ 94{
95 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 95 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
96 return obj->source; 96 return obj->source;
97} 97}
98 98
99EOLIAN static Eina_Bool 99EOLIAN static Eina_Bool
100_ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format) 100_ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format)
101{ 101{
102 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 102 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
103 103
104 if (ea_obj->source) { 104 if (ea_obj->source) {
105 ERR("Input is already open - cannot change format"); 105 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
131EOLIAN static Ecore_Audio_Format 131EOLIAN static Ecore_Audio_Format
132_ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) 132_ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
133{ 133{
134 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 134 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
135 return obj->format;; 135 return obj->format;;
136} 136}
137 137
@@ -147,8 +147,8 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
147EOLIAN static void 147EOLIAN static void
148_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) 148_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)
149{ 149{
150 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 150 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
151 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 151 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
152 152
153 if (!ESF_LOAD()) return; 153 if (!ESF_LOAD()) return;
154 if (obj->handle) { 154 if (obj->handle) {
@@ -201,7 +201,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
201EOLIAN static void 201EOLIAN static void
202_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj) 202_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
203{ 203{
204 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 204 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
205 205
206 if (!ESF_LOAD()) return; 206 if (!ESF_LOAD()) return;
207 if (obj->handle) 207 if (obj->handle)
@@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile
210 if (ea_obj->vio) 210 if (ea_obj->vio)
211 _free_vio(ea_obj); 211 _free_vio(ea_obj);
212 212
213 efl_destructor(eo_super(eo_obj, MY_CLASS)); 213 efl_destructor(efl_super(eo_obj, MY_CLASS));
214} 214}
215 215
216#include "ecore_audio_in_sndfile.eo.c" 216#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
29_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len) 29_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len)
30{ 30{
31 size_t i, remain; 31 size_t i, remain;
32 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 32 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
33 33
34 float *val = data; 34 float *val = data;
35 35
@@ -50,7 +50,7 @@ EOLIAN static double
50_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode) 50_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode)
51{ 51{
52 int tmp; 52 int tmp;
53 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 53 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
54 54
55 switch (mode) { 55 switch (mode) {
56 case SEEK_SET: 56 case SEEK_SET:
@@ -78,7 +78,7 @@ err:
78EOLIAN static void 78EOLIAN static void
79_ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length) 79_ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length)
80{ 80{
81 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 81 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
82 in_obj->length = length; 82 in_obj->length = length;
83} 83}
84 84
@@ -90,7 +90,7 @@ _ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Dat
90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
91 obj->freq = *(int *)val; 91 obj->freq = *(int *)val;
92 } else { 92 } else {
93 efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val); 93 efl_key_data_set(efl_super(eo_obj, MY_CLASS), key, val);
94 } 94 }
95 95
96} 96}
@@ -101,16 +101,16 @@ _ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Dat
101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
102 return (void *) (intptr_t) obj->freq; 102 return (void *) (intptr_t) obj->freq;
103 } else { 103 } else {
104 return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key); 104 return efl_key_data_get(efl_super(eo_obj, MY_CLASS), key);
105 } 105 }
106} 106}
107 107
108EOLIAN static Eo * 108EOLIAN static Eo *
109_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj) 109_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
110{ 110{
111 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 111 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
112 112
113 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 113 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
114 114
115 in_obj->channels = 1; 115 in_obj->channels = 1;
116 in_obj->samplerate = 44100; 116 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)
22 Eo *eo_obj = data; 22 Eo *eo_obj = data;
23 Eo *in; 23 Eo *in;
24 24
25 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 25 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
26 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 26 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
27 27
28 ssize_t written, bread = 0; 28 ssize_t written, bread = 0;
29 float buf[1024]; 29 float buf[1024];
@@ -54,9 +54,9 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
54{ 54{
55 Ecore_Audio_Input *in; 55 Ecore_Audio_Input *in;
56 56
57 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 57 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
58 58
59 in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); 59 in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
60 60
61 if (in->output == eo_obj) 61 if (in->output == eo_obj)
62 return EINA_FALSE; 62 return EINA_FALSE;
@@ -81,7 +81,7 @@ _ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
81{ 81{
82 Ecore_Audio_Input *in; 82 Ecore_Audio_Input *in;
83 83
84 in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); 84 in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
85 85
86 if (in->output != eo_obj) 86 if (in->output != eo_obj)
87 return EINA_FALSE; 87 return EINA_FALSE;
@@ -115,7 +115,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
115EOLIAN static void 115EOLIAN static void
116_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) 116_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)
117{ 117{
118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 118 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
119 119
120 if (ea_obj->vio) 120 if (ea_obj->vio)
121 _free_vio(ea_obj); 121 _free_vio(ea_obj);
@@ -132,7 +132,7 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
132EOLIAN static Eo * 132EOLIAN static Eo *
133_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj) 133_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
134{ 134{
135 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 135 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
136 136
137 obj->need_writer = EINA_TRUE; 137 obj->need_writer = EINA_TRUE;
138 138
@@ -149,7 +149,7 @@ _ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
149 ecore_audio_obj_out_input_detach(eo_obj, in); 149 ecore_audio_obj_out_input_detach(eo_obj, in);
150 } 150 }
151 151
152 efl_destructor(eo_super(eo_obj, MY_CLASS)); 152 efl_destructor(efl_super(eo_obj, MY_CLASS));
153} 153}
154 154
155#include "ecore_audio_out.eo.c" 155#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
209_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, void *sd EINA_UNUSED, double volume) 209_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, void *sd EINA_UNUSED, double volume)
210{ 210{
211 // TODO Change volume of playing inputs 211 // TODO Change volume of playing inputs
212 ecore_audio_obj_volume_set(eo_super(obj, MY_CLASS), volume); 212 ecore_audio_obj_volume_set(efl_super(obj, MY_CLASS), volume);
213} 213}
214 214
215EOLIAN static Eina_Bool 215EOLIAN static Eina_Bool
@@ -220,7 +220,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
220 OSStatus err; 220 OSStatus err;
221 Eina_Bool chk; 221 Eina_Bool chk;
222 222
223 chk = ecore_audio_obj_out_input_attach(eo_super(obj, MY_CLASS), input); 223 chk = ecore_audio_obj_out_input_attach(efl_super(obj, MY_CLASS), input);
224 if (EINA_UNLIKELY(!chk)) 224 if (EINA_UNLIKELY(!chk))
225 { 225 {
226 ERR("Failed to attach input (eo_do_super)"); 226 ERR("Failed to attach input (eo_do_super)");
@@ -312,7 +312,7 @@ free_proc_id:
312free_helper: 312free_helper:
313 free(helper); 313 free(helper);
314detach: 314detach:
315 ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); 315 ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input);
316return_failure: 316return_failure:
317 return EINA_FALSE; 317 return EINA_FALSE;
318} 318}
@@ -328,7 +328,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
328 data = efl_key_data_get(input, "coreaudio_data"); 328 data = efl_key_data_get(input, "coreaudio_data");
329 _core_audio_helper_free(data); 329 _core_audio_helper_free(data);
330 330
331 ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); 331 ret = ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input);
332 332
333 return ret; 333 return ret;
334} 334}
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_
52 Eina_List *input; 52 Eina_List *input;
53 uint32_t idx; 53 uint32_t idx;
54 pa_cvolume pa_volume; 54 pa_cvolume pa_volume;
55 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 55 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
56 56
57 if (!EPA_LOAD()) return; 57 if (!EPA_LOAD()) return;
58 if (volume < 0) 58 if (volume < 0)
@@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
60 60
61 EPA_CALL(pa_cvolume_set)(&pa_volume, 2, volume * PA_VOLUME_NORM); 61 EPA_CALL(pa_cvolume_set)(&pa_volume, 2, volume * PA_VOLUME_NORM);
62 62
63 ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume); 63 ecore_audio_obj_volume_set(efl_super(eo_obj, MY_CLASS), volume);
64 64
65 EINA_LIST_FOREACH(out_obj->inputs, input, in) { 65 EINA_LIST_FOREACH(out_obj->inputs, input, in) {
66 stream = efl_key_data_get(in, "pulse_data"); 66 stream = efl_key_data_get(in, "pulse_data");
@@ -110,10 +110,10 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
110 double speed = 0; 110 double speed = 0;
111 pa_stream *stream; 111 pa_stream *stream;
112 Eina_Bool ret = EINA_FALSE; 112 Eina_Bool ret = EINA_FALSE;
113 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 113 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
114 114
115 if (!EPA_LOAD()) return EINA_FALSE; 115 if (!EPA_LOAD()) return EINA_FALSE;
116 ret = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); 116 ret = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in);
117 if (!ret) 117 if (!ret)
118 return EINA_FALSE; 118 return EINA_FALSE;
119 119
@@ -128,7 +128,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
128 stream = EPA_CALL(pa_stream_new)(class_vars.context, name, &ss, NULL); 128 stream = EPA_CALL(pa_stream_new)(class_vars.context, name, &ss, NULL);
129 if (!stream) { 129 if (!stream) {
130 ERR("Could not create stream"); 130 ERR("Could not create stream");
131 ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); 131 ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
132 return EINA_FALSE; 132 return EINA_FALSE;
133 } 133 }
134 134
@@ -184,7 +184,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
184 pa_operation *op; 184 pa_operation *op;
185 185
186 if (!EPA_LOAD()) return EINA_FALSE; 186 if (!EPA_LOAD()) return EINA_FALSE;
187 ret2 = ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); 187 ret2 = ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
188 if (!ret2) 188 if (!ret2)
189 return EINA_FALSE; 189 return EINA_FALSE;
190 190
@@ -214,7 +214,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
214 214
215 //ref everything in the list to be sure... 215 //ref everything in the list to be sure...
216 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 216 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
217 eo_ref(eo_obj); 217 efl_ref(eo_obj);
218 } 218 }
219 // the callback here can delete things in the list.. 219 // the callback here can delete things in the list..
220 if (state == PA_CONTEXT_READY) { 220 if (state == PA_CONTEXT_READY) {
@@ -232,7 +232,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
232 } 232 }
233 // now unref everything safely 233 // now unref everything safely
234 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { 234 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
235 eo_unref(eo_obj); 235 efl_unref(eo_obj);
236 } 236 }
237} 237}
238 238
@@ -247,7 +247,7 @@ static void _state_job(void *data EINA_UNUSED)
247 DBG("PA context fail."); 247 DBG("PA context fail.");
248 //ref everything in the list to be sure... 248 //ref everything in the list to be sure...
249 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 249 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
250 eo_ref(eo_obj); 250 efl_ref(eo_obj);
251 } 251 }
252 // the callback here can delete things in the list.. 252 // the callback here can delete things in the list..
253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
@@ -255,7 +255,7 @@ static void _state_job(void *data EINA_UNUSED)
255 } 255 }
256 // now unref everything safely 256 // now unref everything safely
257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { 257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
258 eo_unref(eo_obj); 258 efl_unref(eo_obj);
259 } 259 }
260 } 260 }
261 class_vars.state_job = NULL; 261 class_vars.state_job = NULL;
@@ -266,10 +266,10 @@ _ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_
266{ 266{
267 int argc; 267 int argc;
268 char **argv; 268 char **argv;
269 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 269 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
270 270
271 if (!EPA_LOAD()) return NULL; 271 if (!EPA_LOAD()) return NULL;
272 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 272 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
273 273
274 out_obj->need_writer = EINA_FALSE; 274 out_obj->need_writer = EINA_FALSE;
275 275
@@ -296,7 +296,7 @@ EOLIAN static void
296_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) 296_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
297{ 297{
298 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); 298 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
299 efl_destructor(eo_super(eo_obj, MY_CLASS)); 299 efl_destructor(efl_super(eo_obj, MY_CLASS));
300} 300}
301 301
302#include "ecore_audio_out_pulse.eo.c" 302#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)
33 Eo *eo_obj = data; 33 Eo *eo_obj = data;
34 Eo *in; 34 Eo *in;
35 35
36 Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS); 36 Ecore_Audio_Out_Sndfile_Data *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS);
37 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 37 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
38 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 38 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
39 39
40 ssize_t written, bread = 0; 40 ssize_t written, bread = 0;
41 float buf[1024]; 41 float buf[1024];
@@ -63,12 +63,12 @@ static Eina_Bool _write_cb(void *data)
63EOLIAN static Eina_Bool 63EOLIAN static Eina_Bool
64_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in) 64_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in)
65{ 65{
66 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 66 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
67 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 67 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
68 Eina_Bool ret2 = EINA_FALSE; 68 Eina_Bool ret2 = EINA_FALSE;
69 69
70 if (!ESF_LOAD()) return EINA_FALSE; 70 if (!ESF_LOAD()) return EINA_FALSE;
71 ret2 = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); 71 ret2 = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in);
72 if (!ret2) 72 if (!ret2)
73 return EINA_FALSE; 73 return EINA_FALSE;
74 74
@@ -80,7 +80,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
80 if (!obj->handle) { 80 if (!obj->handle) {
81 eina_stringshare_del(ea_obj->source); 81 eina_stringshare_del(ea_obj->source);
82 ea_obj->source = NULL; 82 ea_obj->source = NULL;
83 ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); 83 ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
84 return EINA_FALSE; 84 return EINA_FALSE;
85 } 85 }
86 86
@@ -97,7 +97,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
97EOLIAN static Eina_Bool 97EOLIAN static Eina_Bool
98_ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source) 98_ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source)
99{ 99{
100 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 100 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
101 101
102 if (!ESF_LOAD()) return EINA_FALSE; 102 if (!ESF_LOAD()) return EINA_FALSE;
103 if (obj->handle) { 103 if (obj->handle) {
@@ -118,14 +118,14 @@ _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
118EOLIAN static const char* 118EOLIAN static const char*
119_ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 119_ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
120{ 120{
121 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 121 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
122 return obj->source; 122 return obj->source;
123} 123}
124 124
125EOLIAN static Eina_Bool 125EOLIAN static Eina_Bool
126_ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format) 126_ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format)
127{ 127{
128 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 128 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
129 129
130 if (ea_obj->source) { 130 if (ea_obj->source) {
131 ERR("Input is already open - cannot change format"); 131 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
157EOLIAN static Ecore_Audio_Format 157EOLIAN static Ecore_Audio_Format
158_ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 158_ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
159{ 159{
160 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 160 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
161 return obj->format; 161 return obj->format;
162} 162}
163 163
164EOLIAN static Eo * 164EOLIAN static Eo *
165_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 165_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
166{ 166{
167 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 167 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
168 168
169 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 169 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
170 170
171 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG); 171 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
172 172
@@ -178,7 +178,7 @@ _ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndf
178EOLIAN static void 178EOLIAN static void
179_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj) 179_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
180{ 180{
181 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 181 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
182 182
183 if (!ESF_LOAD()) return; 183 if (!ESF_LOAD()) return;
184 if (obj->handle) 184 if (obj->handle)
@@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfi
186 if (out_obj->write_idler) 186 if (out_obj->write_idler)
187 ecore_idler_del(out_obj->write_idler); 187 ecore_idler_del(out_obj->write_idler);
188 188
189 efl_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(efl_super(eo_obj, MY_CLASS));
190} 190}
191 191
192#include "ecore_audio_out_sndfile.eo.c" 192#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 @@
16static sf_count_t _wrap_get_filelen(void *data) 16static sf_count_t _wrap_get_filelen(void *data)
17{ 17{
18 Eo *eo_obj = data; 18 Eo *eo_obj = data;
19 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 19 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
20 20
21 if (!ea_obj->vio->vio) 21 if (!ea_obj->vio->vio)
22 goto error; 22 goto error;
@@ -31,7 +31,7 @@ error:
31static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data) 31static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data)
32{ 32{
33 Eo *eo_obj = data; 33 Eo *eo_obj = data;
34 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 34 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
35 35
36 if (!ea_obj->vio->vio) 36 if (!ea_obj->vio->vio)
37 goto error; 37 goto error;
@@ -46,7 +46,7 @@ error:
46static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data) 46static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data)
47{ 47{
48 Eo *eo_obj = data; 48 Eo *eo_obj = data;
49 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 49 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
50 50
51 if (!ea_obj->vio->vio) 51 if (!ea_obj->vio->vio)
52 goto error; 52 goto error;
@@ -61,7 +61,7 @@ error:
61static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data) 61static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data)
62{ 62{
63 Eo *eo_obj = data; 63 Eo *eo_obj = data;
64 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 64 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
65 65
66 if (!ea_obj->vio->vio) 66 if (!ea_obj->vio->vio)
67 goto error; 67 goto error;
@@ -76,7 +76,7 @@ error:
76static sf_count_t _wrap_tell(void *data) 76static sf_count_t _wrap_tell(void *data)
77{ 77{
78 Eo *eo_obj = data; 78 Eo *eo_obj = data;
79 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 79 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
80 80
81 if (!ea_obj->vio->vio) 81 if (!ea_obj->vio->vio)
82 goto error; 82 goto error;