summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/lib/ecore_audio
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r--src/lib/ecore_audio/ecore_audio.eo8
-rw-r--r--src/lib/ecore_audio/ecore_audio_in.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_in_sndfile.eo2
-rw-r--r--src/lib/ecore_audio/ecore_audio_in_tone.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c18
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c12
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c28
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_out.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_out_pulse.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_out_sndfile.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h2
17 files changed, 62 insertions, 62 deletions
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index 7e146de9eb..5d08762112 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -1,5 +1,5 @@
1type @extern Ecore.Audio.Vio: __undefined_type; /* FIXME: Had function pointer members. */ 1type @extern Ecore.Audio.Vio: __undefined_type; /* FIXME: Had function pointer members. */
2type @extern eo_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */ 2type @extern efl_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */
3 3
4enum Ecore.Audio.Format { 4enum Ecore.Audio.Format {
5 auto, [[Automatically detect the format (for inputs)]] 5 auto, [[Automatically detect the format (for inputs)]]
@@ -11,7 +11,7 @@ enum Ecore.Audio.Format {
11 last [[Sentinel value, do not use]] 11 last [[Sentinel value, do not use]]
12} 12}
13 13
14class Ecore.Audio (Eo.Base) 14class Ecore.Audio (Efl.Object)
15{ 15{
16 [[Convenience audio class.]] 16 [[Convenience audio class.]]
17 17
@@ -112,7 +112,7 @@ class Ecore.Audio (Eo.Base)
112 the function callbacks 112 the function callbacks
113 ]] 113 ]]
114 data: void_ptr; [[user data to pass to the VIO functions]] 114 data: void_ptr; [[user data to pass to the VIO functions]]
115 free_func: eo_key_data_free_func; [[this function takes care to 115 free_func: efl_key_data_free_func; [[this function takes care to
116 clean up $data when he VIO is 116 clean up $data when he VIO is
117 destroyed. NULL means do 117 destroyed. NULL means do
118 nothing. 118 nothing.
@@ -121,6 +121,6 @@ class Ecore.Audio (Eo.Base)
121 } 121 }
122 } 122 }
123 implements { 123 implements {
124 Eo.Base.constructor; 124 Efl.Object.constructor;
125 } 125 }
126} 126}
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 57457c2e54..4c7b439ef1 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -150,8 +150,8 @@ class Ecore.Audio.In (Ecore.Audio)
150 } 150 }
151 } 151 }
152 implements { 152 implements {
153 Eo.Base.constructor; 153 Efl.Object.constructor;
154 Eo.Base.destructor; 154 Efl.Object.destructor;
155 Ecore.Audio.vio_set; 155 Ecore.Audio.vio_set;
156 } 156 }
157 events { 157 events {
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index 6b88780624..267538045d 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -3,7 +3,7 @@ class Ecore.Audio.In.Sndfile (Ecore.Audio.In)
3 [[Ecore Audio sndfile input.]] 3 [[Ecore Audio sndfile input.]]
4 eo_prefix: ecore_audio_obj_in_sndfile; 4 eo_prefix: ecore_audio_obj_in_sndfile;
5 implements { 5 implements {
6 Eo.Base.destructor; 6 Efl.Object.destructor;
7 Ecore.Audio.source.set; 7 Ecore.Audio.source.set;
8 Ecore.Audio.source.get; 8 Ecore.Audio.source.get;
9 Ecore.Audio.format.set; 9 Ecore.Audio.format.set;
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 768b491644..fbef1f2feb 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -3,8 +3,8 @@ class Ecore.Audio.In.Tone (Ecore.Audio.In)
3 [[Ecore Audio tone input.]] 3 [[Ecore Audio tone input.]]
4 eo_prefix: ecore_audio_obj_in_tone; 4 eo_prefix: ecore_audio_obj_in_tone;
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.key_data; 7 Efl.Object.key_data;
8 Ecore.Audio.In.length.set; 8 Ecore.Audio.In.length.set;
9 Ecore.Audio.In.seek; 9 Ecore.Audio.In.seek;
10 Ecore.Audio.In.read_internal; 10 Ecore.Audio.In.read_internal;
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index bef68c8b46..26b34ae4e5 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -55,10 +55,10 @@ _ecore_audio_volume_get(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Object *obj)
55} 55}
56 56
57EOLIAN static Eo * 57EOLIAN static Eo *
58_ecore_audio_eo_base_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 eo_constructor(eo_super(eo_obj, MY_CLASS)); 61 return efl_constructor(eo_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 c69bd2fc74..6f20d43bb5 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
27 27
28 obj->speed = speed; 28 obj->speed = speed;
29 29
30 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 30 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
31} 31}
32 32
33EOLIAN static double 33EOLIAN static double
@@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
41{ 41{
42 obj->samplerate = samplerate; 42 obj->samplerate = samplerate;
43 43
44 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 44 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
45} 45}
46 46
47EOLIAN static int 47EOLIAN static int
@@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
107 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); 107 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
108 if (len_read == 0) { 108 if (len_read == 0) {
109 if (!obj->looped || !obj->seekable) { 109 if (!obj->looped || !obj->seekable) {
110 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); 110 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
111 } else { 111 } else {
112 ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET); 112 ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET);
113 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); 113 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
114 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); 114 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
115 } 115 }
116 } 116 }
117 117
@@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
149} 149}
150 150
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, eo_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
155 155
@@ -171,9 +171,9 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
171} 171}
172 172
173EOLIAN static Eo * 173EOLIAN static Eo *
174_ecore_audio_in_eo_base_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 = eo_constructor(eo_super(eo_obj, MY_CLASS)); 176 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
177 177
178 obj->speed = 1.0; 178 obj->speed = 1.0;
179 179
@@ -181,12 +181,12 @@ _ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
181} 181}
182 182
183EOLIAN static void 183EOLIAN static void
184_ecore_audio_in_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Input *obj) 184_ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
185{ 185{
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 eo_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(eo_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 1117a65f14..887ec8b7c0 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -145,7 +145,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
145} 145}
146 146
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, eo_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 = eo_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
@@ -199,7 +199,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
199} 199}
200 200
201EOLIAN static void 201EOLIAN static void
202_ecore_audio_in_sndfile_eo_base_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
205 205
@@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Da
210 if (ea_obj->vio) 210 if (ea_obj->vio)
211 _free_vio(ea_obj); 211 _free_vio(ea_obj);
212 212
213 eo_destructor(eo_super(eo_obj, MY_CLASS)); 213 efl_destructor(eo_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 bf89c73c5e..a44387b727 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -83,34 +83,34 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
83} 83}
84 84
85EOLIAN static void 85EOLIAN static void
86_ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val) 86_ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val)
87{ 87{
88 if (!key) return; 88 if (!key) return;
89 89
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 eo_key_data_set(eo_super(eo_obj, MY_CLASS), key, val); 93 efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
94 } 94 }
95 95
96} 96}
97 97
98EOLIAN static void * 98EOLIAN static void *
99_ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key) 99_ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
100{ 100{
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 eo_key_data_get(eo_super(eo_obj, MY_CLASS), key); 104 return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key);
105 } 105 }
106} 106}
107 107
108EOLIAN static Eo * 108EOLIAN static Eo *
109_ecore_audio_in_tone_eo_base_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
112 112
113 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 113 eo_obj = efl_constructor(eo_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_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
index bf6bee04e8..c7bb60061b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -37,7 +37,7 @@ extern "C"
37/** 37/**
38 * @brief The frequency of the tone in Hz 38 * @brief The frequency of the tone in Hz
39 * 39 *
40 * Set with @ref eo_key_data_set() 40 * Set with @ref efl_key_data_set()
41 */ 41 */
42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq" 42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
43 43
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index c34245fa49..10e26c5430 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
113} 113}
114 114
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, eo_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
119 119
@@ -130,9 +130,9 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
130} 130}
131 131
132EOLIAN static Eo * 132EOLIAN static Eo *
133_ecore_audio_out_eo_base_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 = eo_constructor(eo_super(eo_obj, MY_CLASS)); 135 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
136 136
137 obj->need_writer = EINA_TRUE; 137 obj->need_writer = EINA_TRUE;
138 138
@@ -140,7 +140,7 @@ _ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
140} 140}
141 141
142EOLIAN static void 142EOLIAN static void
143_ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj) 143_ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
144{ 144{
145 Eina_List *cur, *tmp; 145 Eina_List *cur, *tmp;
146 Eo *in; 146 Eo *in;
@@ -149,7 +149,7 @@ _ecore_audio_out_eo_base_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 eo_destructor(eo_super(eo_obj, MY_CLASS)); 152 efl_destructor(eo_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 e3217567a5..91977b80c2 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
@@ -293,7 +293,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
293 } 293 }
294 294
295 /* Keep track of data for deallocation */ 295 /* Keep track of data for deallocation */
296 eo_key_data_set(input, "coreaudio_data", helper); 296 efl_key_data_set(input, "coreaudio_data", helper);
297 297
298 /* Start playing */ 298 /* Start playing */
299 helper->is_playing = EINA_TRUE; 299 helper->is_playing = EINA_TRUE;
@@ -325,7 +325,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
325 325
326 DBG("Detach"); 326 DBG("Detach");
327 /* Free helper */ 327 /* Free helper */
328 data = eo_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(eo_super(obj, MY_CLASS), input);
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 e665df7da0..c920f95f89 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -63,7 +63,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
63 ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume); 63 ecore_audio_obj_volume_set(eo_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 = eo_key_data_get(in, "pulse_data"); 66 stream = efl_key_data_get(in, "pulse_data");
67 idx = EPA_CALL(pa_stream_get_index)(stream); 67 idx = EPA_CALL(pa_stream_get_index)(stream);
68 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_context_set_sink_input_volume)(class_vars.context, idx, &pa_volume, NULL, NULL)); 68 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_context_set_sink_input_volume)(class_vars.context, idx, &pa_volume, NULL, NULL));
69 } 69 }
@@ -98,7 +98,7 @@ static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event)
98 samplerate = ecore_audio_obj_in_samplerate_get(event->object); 98 samplerate = ecore_audio_obj_in_samplerate_get(event->object);
99 speed = ecore_audio_obj_in_speed_get(event->object); 99 speed = ecore_audio_obj_in_speed_get(event->object);
100 100
101 stream = eo_key_data_get(event->object, "pulse_data"); 101 stream = efl_key_data_get(event->object, "pulse_data");
102 102
103 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_stream_update_sample_rate)(stream, samplerate * speed, NULL, NULL)); 103 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_stream_update_sample_rate)(stream, samplerate * speed, NULL, NULL));
104} 104}
@@ -132,9 +132,9 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
132 return EINA_FALSE; 132 return EINA_FALSE;
133 } 133 }
134 134
135 eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj); 135 efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj);
136 136
137 eo_key_data_set(in, "pulse_data", stream); 137 efl_key_data_set(in, "pulse_data", stream);
138 138
139 139
140 EPA_CALL(pa_stream_set_write_callback)(stream, _write_cb, in); 140 EPA_CALL(pa_stream_set_write_callback)(stream, _write_cb, in);
@@ -149,7 +149,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
149static void _delayed_attach_cb(void *data, const Eo_Event *event) 149static void _delayed_attach_cb(void *data, const Eo_Event *event)
150{ 150{
151 Eo *in = data; 151 Eo *in = data;
152 eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 152 efl_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
153 153
154 _input_attach_internal(event->object, in); 154 _input_attach_internal(event->object, in);
155} 155}
@@ -161,7 +161,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_
161 161
162 if (class_vars.state != PA_CONTEXT_READY) { 162 if (class_vars.state != PA_CONTEXT_READY) {
163 DBG("Delaying input_attach because PA context is not ready."); 163 DBG("Delaying input_attach because PA context is not ready.");
164 eo_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 164 efl_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
165 } else { 165 } else {
166 retval = _input_attach_internal(eo_obj, in); 166 retval = _input_attach_internal(eo_obj, in);
167 } 167 }
@@ -188,7 +188,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
188 if (!ret2) 188 if (!ret2)
189 return EINA_FALSE; 189 return EINA_FALSE;
190 190
191 stream = eo_key_data_get(in, "pulse_data"); 191 stream = efl_key_data_get(in, "pulse_data");
192 192
193 EPA_CALL(pa_stream_set_write_callback)(stream, NULL, NULL); 193 EPA_CALL(pa_stream_set_write_callback)(stream, NULL, NULL);
194 op = EPA_CALL(pa_stream_drain) (stream, _drain_cb, NULL); 194 op = EPA_CALL(pa_stream_drain) (stream, _drain_cb, NULL);
@@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
220 if (state == PA_CONTEXT_READY) { 220 if (state == PA_CONTEXT_READY) {
221 DBG("PA context ready."); 221 DBG("PA context ready.");
222 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 222 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
223 eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); 223 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
224 } 224 }
225 } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) { 225 } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
226 DBG("PA context fail."); 226 DBG("PA context fail.");
227 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 227 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
228 eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 228 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
229 } 229 }
230 } else { 230 } else {
231 DBG("Connection state %i", state); 231 DBG("Connection state %i", state);
@@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED)
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) {
254 eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 254 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
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) {
@@ -262,14 +262,14 @@ static void _state_job(void *data EINA_UNUSED)
262} 262}
263 263
264EOLIAN static Eo * 264EOLIAN static Eo *
265_ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) 265_ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
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 = eo_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 = eo_constructor(eo_super(eo_obj, MY_CLASS)); 272 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
273 273
274 out_obj->need_writer = EINA_FALSE; 274 out_obj->need_writer = EINA_FALSE;
275 275
@@ -293,10 +293,10 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat
293} 293}
294 294
295EOLIAN static void 295EOLIAN static void
296_ecore_audio_out_pulse_eo_base_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 eo_destructor(eo_super(eo_obj, MY_CLASS)); 299 efl_destructor(eo_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 6143b4b02d..fddc898dca 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -162,11 +162,11 @@ _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndf
162} 162}
163 163
164EOLIAN static Eo * 164EOLIAN static Eo *
165_ecore_audio_out_sndfile_eo_base_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
168 168
169 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 169 eo_obj = efl_constructor(eo_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
@@ -176,7 +176,7 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
176} 176}
177 177
178EOLIAN static void 178EOLIAN static void
179_ecore_audio_out_sndfile_eo_base_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 = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
182 182
@@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_
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 eo_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(eo_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_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index f2f1d7c484..4192e73ed5 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -34,8 +34,8 @@ class Ecore.Audio.Out (Ecore.Audio)
34 } 34 }
35 } 35 }
36 implements { 36 implements {
37 Eo.Base.constructor; 37 Efl.Object.constructor;
38 Eo.Base.destructor; 38 Efl.Object.destructor;
39 Ecore.Audio.vio_set; 39 Ecore.Audio.vio_set;
40 } 40 }
41} 41}
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 770aa744cb..b107eefda8 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -4,8 +4,8 @@ class Ecore.Audio.Out.Pulse (Ecore.Audio.Out)
4 eo_prefix: ecore_audio_obj_out_pulse; 4 eo_prefix: ecore_audio_obj_out_pulse;
5 event_prefix: ecore_audio_out_pulse; 5 event_prefix: ecore_audio_out_pulse;
6 implements { 6 implements {
7 Eo.Base.constructor; 7 Efl.Object.constructor;
8 Eo.Base.destructor; 8 Efl.Object.destructor;
9 Ecore.Audio.volume.set; 9 Ecore.Audio.volume.set;
10 Ecore.Audio.Out.input_attach; 10 Ecore.Audio.Out.input_attach;
11 Ecore.Audio.Out.input_detach; 11 Ecore.Audio.Out.input_detach;
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index d807f654da..510f644f63 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -3,8 +3,8 @@ class Ecore.Audio.Out.Sndfile (Ecore.Audio.Out)
3 [[Ecore audio output to the sndfile library.]] 3 [[Ecore audio output to the sndfile library.]]
4 eo_prefix: ecore_audio_obj_out_sndfile; 4 eo_prefix: ecore_audio_obj_out_sndfile;
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Ecore.Audio.source.get; 8 Ecore.Audio.source.get;
9 Ecore.Audio.source.set; 9 Ecore.Audio.source.set;
10 Ecore.Audio.format.get; 10 Ecore.Audio.format.get;
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index 6cf19a7921..0bccb0ee68 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
94struct _Ecore_Audio_Vio_Internal { 94struct _Ecore_Audio_Vio_Internal {
95 Ecore_Audio_Vio *vio; 95 Ecore_Audio_Vio *vio;
96 void *data; 96 void *data;
97 eo_key_data_free_func free_func; 97 efl_key_data_free_func free_func;
98}; 98};
99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal; 99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;
100 100