aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje/edje_multisense.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/edje/edje_multisense.c')
-rw-r--r--src/lib/edje/edje_multisense.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 92e36d50a0..3186a5b9de 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -202,18 +202,18 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
eet_data->vio.tell = eet_snd_file_tell;
eet_data->offset = 0;
- in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL,
- ecore_audio_obj_name_set(snd_id_str),
- ecore_audio_obj_in_speed_set(speed),
- ecore_audio_obj_vio_set(&eet_data->vio, eet_data, _free),
- eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+ eo_add(in, ECORE_AUDIO_IN_SNDFILE_CLASS, NULL,
+ ecore_audio_obj_name_set(NULL, snd_id_str),
+ ecore_audio_obj_in_speed_set(NULL, speed),
+ ecore_audio_obj_vio_set(NULL, &eet_data->vio, eet_data, _free),
+ eo_event_callback_add(NULL, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
if (!out)
{
#if HAVE_COREAUDIO
- out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
+ eo_add(out, ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
#elif HAVE_PULSE
- out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
- eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ eo_add(out, ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
+ eo_event_callback_add(NULL, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
#endif
if (out) outs++;
}
@@ -227,7 +227,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
eo_del(in);
return EINA_FALSE;
}
- eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
+ eo_do(out, ret = ecore_audio_obj_out_input_attach(out, in));
if (!ret)
{
ERR("Could not attach input");
@@ -274,24 +274,24 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
tone = &ed->file->sound_dir->tones[i];
if (!strcmp(tone->name, tone_name))
{
- in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
- eo_do(in, ecore_audio_obj_name_set("tone"));
- eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value));
- eo_do(in, ecore_audio_obj_in_length_set(duration));
- eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+ eo_add(in, ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ eo_do(in, ecore_audio_obj_name_set(in, "tone"));
+ eo_do(in, eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value));
+ eo_do(in, ecore_audio_obj_in_length_set(in, duration));
+ eo_do(in, eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
if (!out)
{
#if HAVE_COREAUDIO
- out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
+ eo_add(out, ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
#elif HAVE_PULSE
- out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
- eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ eo_add(out, ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
+ eo_event_callback_add(NULL, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
#endif
if (out) outs++;
}
- eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
+ eo_do(out, ret = ecore_audio_obj_out_input_attach(out, in));
if (!ret)
{
ERR("Could not attach input");