summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c')
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c16
1 files changed, 8 insertions, 8 deletions
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 d986b67..e24cfeb 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -43,7 +43,7 @@ static Eina_Bool _write_cb(void *data)
43 /* TODO: Support mixing of multiple inputs */ 43 /* TODO: Support mixing of multiple inputs */
44 in = eina_list_data_get(out_obj->inputs); 44 in = eina_list_data_get(out_obj->inputs);
45 45
46 eo_do(in, bread = ecore_audio_obj_in_read(buf, 4*1024)); 46 bread = ecore_audio_obj_in_read(in, buf, 4*1024);
47 47
48 if (bread == 0) { 48 if (bread == 0) {
49 sf_write_sync(obj->handle); 49 sf_write_sync(obj->handle);
@@ -66,19 +66,19 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
66 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 66 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
67 Eina_Bool ret2 = EINA_FALSE; 67 Eina_Bool ret2 = EINA_FALSE;
68 68
69 eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_attach(in)); 69 ret2 = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in);
70 if (!ret2) 70 if (!ret2)
71 return EINA_FALSE; 71 return EINA_FALSE;
72 72
73 eo_do(in, obj->sfinfo.samplerate = ecore_audio_obj_in_samplerate_get()); 73 obj->sfinfo.samplerate = ecore_audio_obj_in_samplerate_get(in);
74 eo_do(in, obj->sfinfo.channels = ecore_audio_obj_in_channels_get()); 74 obj->sfinfo.channels = ecore_audio_obj_in_channels_get(in);
75 75
76 obj->handle = sf_open(ea_obj->source, SFM_WRITE, &obj->sfinfo); 76 obj->handle = sf_open(ea_obj->source, SFM_WRITE, &obj->sfinfo);
77 77
78 if (!obj->handle) { 78 if (!obj->handle) {
79 eina_stringshare_del(ea_obj->source); 79 eina_stringshare_del(ea_obj->source);
80 ea_obj->source = NULL; 80 ea_obj->source = NULL;
81 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in)); 81 ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in);
82 return EINA_FALSE; 82 return EINA_FALSE;
83 } 83 }
84 84
@@ -163,9 +163,9 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
163{ 163{
164 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 164 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
165 165
166 eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); 166 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
167 167
168 eo_do(eo_obj, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG)); 168 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
169 169
170 // FIXME: Use writer from output 170 // FIXME: Use writer from output
171 out_obj->need_writer = EINA_FALSE; 171 out_obj->need_writer = EINA_FALSE;
@@ -182,7 +182,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_
182 if (out_obj->write_idler) 182 if (out_obj->write_idler)
183 ecore_idler_del(out_obj->write_idler); 183 ecore_idler_del(out_obj->write_idler);
184 184
185 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 185 eo_destructor(eo_super(eo_obj, MY_CLASS));
186} 186}
187 187
188#include "ecore_audio_out_sndfile.eo.c" 188#include "ecore_audio_out_sndfile.eo.c"