diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am index cba995ef7b..c1477571c7 100644 --- a/src/examples/ecore/Makefile.am +++ b/src/examples/ecore/Makefile.am @@ -74,6 +74,7 @@ $(top_builddir)/src/lib/eina/libeina.la \ if HAVE_ECORE_AUDIO EXTRA_PROGRAMS += \ +ecore_audio_playback \ ecore_audio_to_ogg ECORE_AUDIO_COMMON_LDADD = \ diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c index 86ff8c25a1..bdfd7db201 100644 --- a/src/examples/ecore/ecore_audio_playback.c +++ b/src/examples/ecore/ecore_audio_playback.c @@ -13,33 +13,37 @@ #include #include -Ecore_Audio_Object *out = NULL; +Eo *out = NULL; double volume = 1; Eina_List *inputs = NULL; void handle_cmd(char *cmd, size_t bread) { + const char *name; Eina_List *out_inputs, *input; - Ecore_Audio_Object *in; + Eo *in; Eina_Bool paused; - double pos; + double pos, length; int min; if (!out) return; - out_inputs = ecore_audio_output_inputs_get(out); + eo_do(out, ecore_audio_obj_out_inputs_get(&out_inputs)); EINA_LIST_FOREACH(out_inputs, input, in) { - pos = ecore_audio_input_seek(in, 0, SEEK_CUR); + eo_do(in, ecore_audio_obj_in_seek(0, SEEK_CUR, &pos)); if (!strncmp(cmd, "<", bread)) - pos = ecore_audio_input_seek(in, -10, SEEK_CUR); + eo_do(in, ecore_audio_obj_in_seek(-10, SEEK_CUR, &pos)); else if (!strncmp(cmd, ">", bread)) - pos = ecore_audio_input_seek(in, 10, SEEK_CUR); + eo_do(in, ecore_audio_obj_in_seek(10, SEEK_CUR, &pos)); min = pos / 60; - printf("Position: %2im %5.02fs (%0.2f%%) - %s\n", min, pos - min * 60, pos/ecore_audio_input_length_get(in)*100, ecore_audio_input_name_get(in)); + + eo_do(in, ecore_audio_obj_name_get(&name)); + eo_do(in, ecore_audio_obj_in_length_get(&length)); + printf("Position: %2im %5.02fs (%0.2f%%) - %s\n", min, pos - min * 60, pos/length*100, name); } @@ -49,15 +53,18 @@ handle_cmd(char *cmd, size_t bread) else if (!strncmp(cmd, "n", bread)) { in = eina_list_data_get(out_inputs); - ecore_audio_output_input_del(out, in); + eo_do(out, ecore_audio_obj_out_input_detach(in)); inputs = eina_list_remove(inputs, in); if (eina_list_count(inputs) > 0) { - in = (Ecore_Audio_Object *)eina_list_data_get(inputs); + in = (Eo *)eina_list_data_get(inputs); - printf("Start: %s (%0.2fs)\n", ecore_audio_input_name_get(in), ecore_audio_input_length_get(in)); - ecore_audio_output_input_add(out, in); + eo_do(in, ecore_audio_obj_name_get(&name), + 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)); } else { @@ -70,33 +77,39 @@ handle_cmd(char *cmd, size_t bread) inputs = eina_list_remove(inputs, eina_list_data_get(inputs)); if (eina_list_count(inputs) > 0) { - in = (Ecore_Audio_Object *)eina_list_data_get(inputs); + in = (Eo *)eina_list_data_get(inputs); - printf("Start: %s (%0.2fs)\n", ecore_audio_input_name_get(in), ecore_audio_input_length_get(in)); - ecore_audio_output_input_add(out, in); + eo_do(in, ecore_audio_obj_name_get(&name), + 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)); } } else if (!strncmp(cmd, "l", bread)) { EINA_LIST_FOREACH(out_inputs, input, in) { - Eina_Bool loop = !ecore_audio_input_looped_get(in); - printf("%s song %s\n", loop?"Looping":"Not looping", ecore_audio_input_name_get(in)); - ecore_audio_input_looped_set(in, loop); + Eina_Bool loop; + eo_do(in, ecore_audio_obj_in_looped_get(&loop), + ecore_audio_obj_name_get(&name)); + + printf("%s song %s\n", !loop?"Looping":"Not looping", name); + eo_do(in, ecore_audio_obj_in_looped_set(!loop)); } } else if (!strncmp(cmd, "+", bread)) { if (volume < 1.5) volume += 0.01; - ecore_audio_output_volume_set(out, volume); + eo_do(out, ecore_audio_obj_volume_set(volume)); printf("Volume: %3.0f%%\n", volume * 100); } else if (!strncmp(cmd, "-", bread)) { if (volume > 0) volume -= 0.01; - ecore_audio_output_volume_set(out, volume); + eo_do(out, ecore_audio_obj_volume_set(volume)); printf("Volume: %3.0f%%\n", volume * 100); } else if (!strncmp(cmd, "*", bread)) @@ -104,11 +117,12 @@ handle_cmd(char *cmd, size_t bread) double speed; EINA_LIST_FOREACH(out_inputs, input, in) { - speed = ecore_audio_input_speed_get(in); + eo_do(in, ecore_audio_obj_in_speed_get(&speed)); if (speed < 2.0) speed += 0.01; - ecore_audio_input_speed_set(in, speed); - printf("Speed: %3.0f%% (%s)\n", speed * 100, ecore_audio_input_name_get(in)); + eo_do(in, ecore_audio_obj_in_speed_set(speed), + ecore_audio_obj_name_get(&name)); + printf("Speed: %3.0f%% (%s)\n", speed * 100, name); } } else if (!strncmp(cmd, "/", bread)) @@ -116,20 +130,23 @@ handle_cmd(char *cmd, size_t bread) double speed; EINA_LIST_FOREACH(out_inputs, input, in) { - speed = ecore_audio_input_speed_get(in); + eo_do(in, ecore_audio_obj_in_speed_get(&speed)); if (speed > 0.5) speed -= 0.01; - ecore_audio_input_speed_set(in, speed); - printf("Speed: %3.0f%% (%s)\n", speed * 100, ecore_audio_input_name_get(in)); + eo_do(in, ecore_audio_obj_in_speed_set(speed), + ecore_audio_obj_name_get(&name)); + printf("Speed: %3.0f%% (%s)\n", speed * 100, name); } } else if (!strncmp(cmd, " ", bread)) { EINA_LIST_FOREACH(out_inputs, input, in) { - paused = ecore_audio_input_paused_get(in); - ecore_audio_input_paused_set(in, !paused); - printf("%s %s\n%0.2f remaining\n", !paused ? "Paused" : "Unpaused", ecore_audio_input_name_get(in), ecore_audio_input_remaining_get(in)); + eo_do(in, ecore_audio_obj_paused_get(&paused), + ecore_audio_obj_name_get(&name), + ecore_audio_obj_in_remaining_get(&length)); + printf("%s %s\n%0.2f remaining\n", !paused ? "Paused" : "Unpaused", name, length); + eo_do(in, ecore_audio_obj_paused_set(!paused)); } } else if (!strncmp(cmd, "q", bread)) @@ -146,7 +163,7 @@ handle_input(void *data, Ecore_Fd_Handler *handler) { size_t bread; char buf[20]; - int fd, i; + int fd; if (!ecore_main_fd_handler_active_get(handler, ECORE_FD_READ)) return EINA_TRUE; @@ -169,28 +186,35 @@ handle_input(void *data, Ecore_Fd_Handler *handler) static Eina_Bool _play_started(void *data, int type, void *event) { - Ecore_Audio_Object *in = (Ecore_Audio_Object *)event; - printf("Start: %s\n", ecore_audio_input_name_get(in)); + const char *name; + Eo *in = event; + + eo_do(in, ecore_audio_obj_name_get(&name)); + printf("Start: %s\n", name); + return EINA_TRUE; } -static Eina_Bool _play_finished(void *data, int type, void *event) +static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { - Ecore_Audio_Object *in = (Ecore_Audio_Object *)event; + const char *name; - printf("Done: %s\n", ecore_audio_input_name_get(in)); + eo_do(in, ecore_audio_obj_name_get(&name)); + printf("Done: %s\n", name); inputs = eina_list_remove(inputs, in); - ecore_audio_output_input_del(out, in); - ecore_audio_input_del(in); + eo_do(out, ecore_audio_obj_out_input_detach(in)); + eo_del(in); if (eina_list_count(inputs) > 0) { - in = (Ecore_Audio_Object *)eina_list_data_get(inputs); + const char *name; + in = (Eo *)eina_list_data_get(inputs); - printf("Start: %s\n", ecore_audio_input_name_get(in)); - ecore_audio_output_input_add(out, in); + eo_do(in, ecore_audio_obj_name_get(&name)); + printf("Start: %s\n", name); + eo_do(out, ecore_audio_obj_out_input_attach(in)); } else { @@ -201,24 +225,13 @@ static Eina_Bool _play_finished(void *data, int type, void *event) return EINA_TRUE; } -Eina_Bool -output_add(void *data) -{ - Ecore_Audio_Object *in = (Ecore_Audio_Object *)eina_list_data_get(inputs); - - printf("Start: %s (%0.2fs)\n", ecore_audio_input_name_get(in), ecore_audio_input_length_get(in)); - out = ecore_audio_output_add(ECORE_AUDIO_TYPE_PULSE); - ecore_audio_output_input_add(out, in); - return EINA_FALSE; -} - int main(int argc, const char *argv[]) { - int i; + int i, freq; struct termios tcorig, tcnew; - Ecore_Audio_Object *in; + Eo *in; char *tmp, *tmp2, *val; if (argc < 2) @@ -230,15 +243,13 @@ main(int argc, const char *argv[]) ecore_init(); ecore_audio_init(); - ecore_event_handler_add(ECORE_AUDIO_INPUT_STARTED, _play_started, NULL); - ecore_event_handler_add(ECORE_AUDIO_INPUT_LOOPED, _play_started, NULL); - ecore_event_handler_add(ECORE_AUDIO_INPUT_ENDED, _play_finished, NULL); + ecore_app_args_set(argc, argv); for (i=1;i