jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=03b99d58b22269daa63130796f5265fb2de26e0a
commit 03b99d58b22269daa63130796f5265fb2de26e0a Author: Daniel Zaoui <[email protected]> Date: Thu Apr 10 12:07:42 2014 +0300 Eo2: Fix other forgotten ret. --- src/examples/ecore/ecore_audio_custom.c | 2 +- src/examples/ecore/ecore_audio_playback.c | 14 +++++++------- src/examples/ecore/ecore_audio_to_ogg.c | 6 +++--- src/tests/ecore/ecore_test_ecore_audio.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c index b5dbb7c..7355335 100644 --- a/src/examples/ecore/ecore_audio_custom.c +++ b/src/examples/ecore/ecore_audio_custom.c @@ -70,7 +70,7 @@ main(int argc, const char *argv[]) eo_do(in, ecore_audio_obj_volume_set(0.7)); eo_do(in, ecore_audio_obj_vio_set(&vio, NULL, NULL)); - eo_do(out, ecore_audio_obj_out_input_attach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) { printf("Could not attach input"); goto end; diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c index 56bfa07..efd3036 100644 --- a/src/examples/ecore/ecore_audio_playback.c +++ b/src/examples/ecore/ecore_audio_playback.c @@ -53,7 +53,7 @@ handle_cmd(char *cmd, size_t bread) else if (!strncmp(cmd, "n", bread)) { in = eina_list_data_get(out_inputs); - eo_do(out, ecore_audio_obj_out_input_detach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_detach(in)); if (!ret) printf("Could not detach input\n"); @@ -67,7 +67,7 @@ handle_cmd(char *cmd, size_t bread) ecore_audio_obj_in_length_get(&length)); printf("Start: %s (%0.2fs)\n", name, length); - eo_do(out, ecore_audio_obj_out_input_attach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) printf("Could not attach input %s\n", name); } @@ -88,7 +88,7 @@ handle_cmd(char *cmd, size_t bread) ecore_audio_obj_in_length_get(&length)); printf("Start: %s (%0.2fs)\n", name, length); - eo_do(out, ecore_audio_obj_out_input_attach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) printf("Could not attach input %s\n", name); } @@ -200,7 +200,7 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_D printf("Done: %s\n", name); inputs = eina_list_remove(inputs, in); - eo_do(out, ecore_audio_obj_out_input_detach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_detach(in)); eo_del(in); if (!ret) @@ -214,7 +214,7 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_D eo_do(in, ecore_audio_obj_name_get(&name)); printf("Start: %s\n", name); - eo_do(out, ecore_audio_obj_out_input_attach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) printf("Could not attach input %s\n", name); } @@ -285,7 +285,7 @@ main(int argc, const char *argv[]) tmp = strdup(argv[i]); eo_do(in, ecore_audio_obj_name_set(basename(tmp))); free(tmp); - eo_do(in, ecore_audio_obj_source_set(argv[i], &ret)); + eo_do(in, ret = ecore_audio_obj_source_set(argv[i])); if (!ret) { printf("Could not set %s as input\n", argv[i]); continue; @@ -308,7 +308,7 @@ main(int argc, const char *argv[]) printf("Start: %s (%0.2fs)\n", name, length); out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL); - eo_do(out, ecore_audio_obj_out_input_attach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) printf("Could not attach input %s\n", name); diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c index dac6aa6..7048ed5 100644 --- a/src/examples/ecore/ecore_audio_to_ogg.c +++ b/src/examples/ecore/ecore_audio_to_ogg.c @@ -51,7 +51,7 @@ main(int argc, char *argv[]) in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL); eo_do(in, ecore_audio_obj_name_set(basename(argv[1]))); - eo_do(in, ecore_audio_obj_source_set(argv[1], &ret)); + eo_do(in, ret = ecore_audio_obj_source_set(argv[1])); if (!ret) { printf("Could not set %s as input\n", argv[1]); eo_del(in); @@ -61,7 +61,7 @@ main(int argc, char *argv[]) eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL)); out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); - eo_do(out, ecore_audio_obj_source_set(argv[2], &ret)); + eo_do(out, ret = ecore_audio_obj_source_set(argv[2])); if (!ret) { printf("Could not set %s as output\n", argv[2]); eo_del(in); @@ -69,7 +69,7 @@ main(int argc, char *argv[]) return 1; } - eo_do(out, ecore_audio_obj_out_input_attach(in, &ret)); + eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) { printf("Could not attach input\n"); eo_del(out); diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c index e4ce60a..ea51c80 100644 --- a/src/tests/ecore/ecore_test_ecore_audio.c +++ b/src/tests/ecore/ecore_test_ecore_audio.c @@ -294,7 +294,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile) fail_if(fmt != ECORE_AUDIO_FORMAT_WAV); -// eo_do(out, ecore_audio_obj_source_set("/tmp/file/does/not/exist/hopefully.wav", &ret)); +// eo_do(out, ret = ecore_audio_obj_source_set("/tmp/file/does/not/exist/hopefully.wav")); // fail_if(ret); eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav")); --
