summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c')
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c20
1 files changed, 10 insertions, 10 deletions
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 1d2ead4..aa0d76b 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
@@ -185,7 +185,7 @@ _audio_io_proc_cb(AudioObjectID obj_id EINA_UNUSED,
185 185
186 if (helper->fake_stereo) 186 if (helper->fake_stereo)
187 { 187 {
188 eo_do(helper->input, bread = ecore_audio_obj_in_read(buf, size * 2)); 188 bread = ecore_audio_obj_in_read(helper->input, buf, size * 2);
189 189
190 for (k = bread - 1; k >= 0; --k) 190 for (k = bread - 1; k >= 0; --k)
191 { 191 {
@@ -196,7 +196,7 @@ _audio_io_proc_cb(AudioObjectID obj_id EINA_UNUSED,
196 } 196 }
197 else 197 else
198 { 198 {
199 eo_do(helper->input, bread = ecore_audio_obj_in_read(buf, size * 4)); 199 bread = ecore_audio_obj_in_read(helper->input, buf, size * 4);
200 bread /= 4; 200 bread /= 4;
201 } 201 }
202 202
@@ -219,7 +219,7 @@ EOLIAN static void
219_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED, double volume) 219_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED, double volume)
220{ 220{
221 // TODO Change volume of playing inputs 221 // TODO Change volume of playing inputs
222 eo_do_super(obj, MY_CLASS, ecore_audio_obj_volume_set(volume)); 222 ecore_audio_obj_volume_set(eo_super(obj, MY_CLASS), volume);
223} 223}
224 224
225EOLIAN static Eina_Bool 225EOLIAN static Eina_Bool
@@ -230,7 +230,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou
230 OSStatus err; 230 OSStatus err;
231 Eina_Bool chk; 231 Eina_Bool chk;
232 232
233 eo_do_super(obj, MY_CLASS, chk = ecore_audio_obj_out_input_attach(input)); 233 chk = ecore_audio_obj_out_input_attach(eo_super(obj, MY_CLASS), input);
234 if (EINA_UNLIKELY(!chk)) 234 if (EINA_UNLIKELY(!chk))
235 { 235 {
236 ERR("Failed to attach input (eo_do_super)"); 236 ERR("Failed to attach input (eo_do_super)");
@@ -266,10 +266,10 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou
266 } 266 }
267 267
268 /* Forward samplerate to CoreAudio */ 268 /* Forward samplerate to CoreAudio */
269 eo_do(input, helper->format.mSampleRate = ecore_audio_obj_in_samplerate_get()); 269 helper->format.mSampleRate = ecore_audio_obj_in_samplerate_get(input);
270 270
271 /* Set channels. If only 1 channel, emulate stereo */ 271 /* Set channels. If only 1 channel, emulate stereo */
272 eo_do(input, channels = ecore_audio_obj_in_channels_get()); 272 channels = ecore_audio_obj_in_channels_get(input);
273 if (channels == 1) 273 if (channels == 1)
274 { 274 {
275 DBG("Fake stereo enabled for input %p", input); 275 DBG("Fake stereo enabled for input %p", input);
@@ -303,7 +303,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou
303 } 303 }
304 304
305 /* Keep track of data for deallocation */ 305 /* Keep track of data for deallocation */
306 eo_do(input, eo_key_data_set("coreaudio_data", helper)); 306 eo_key_data_set(input, "coreaudio_data", helper);
307 307
308 /* Start playing */ 308 /* Start playing */
309 helper->is_playing = EINA_TRUE; 309 helper->is_playing = EINA_TRUE;
@@ -322,7 +322,7 @@ free_proc_id:
322free_helper: 322free_helper:
323 free(helper); 323 free(helper);
324detach: 324detach:
325 eo_do_super(obj, MY_CLASS, ecore_audio_obj_out_input_detach(input)); 325 ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input);
326return_failure: 326return_failure:
327 return EINA_FALSE; 327 return EINA_FALSE;
328} 328}
@@ -335,10 +335,10 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, Ecore_Audio_Ou
335 335
336 DBG("Detach"); 336 DBG("Detach");
337 /* Free helper */ 337 /* Free helper */
338 eo_do(input, data = eo_key_data_get("coreaudio_data")); 338 data = eo_key_data_get(input, "coreaudio_data");
339 _core_audio_helper_free(data); 339 _core_audio_helper_free(data);
340 340
341 eo_do_super(obj, MY_CLASS, ret = ecore_audio_obj_out_input_detach(input)); 341 ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input);
342 342
343 return ret; 343 return ret;
344} 344}