vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ecore suite: Fix hangs when PulseAudio is not present 

EFL can be built with PulseAudio support even if PA is
not present on the system. In that case, ecore_suite will
hang forever. Let's just catch the error instead.

Note: make check will fail if PA is not available (but not hang)

This is not related to Tom's recent mail (but yeah it reminded me
of this bug^^)

Fixes T732.
This commit is contained in:
Jean-Philippe Andre 2014-03-04 15:56:19 +09:00
parent 8ddfa35da6
commit 9750bd51f2
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tests/ecore/ecore_test_ecore_audio.c
View File

@ -13,6 +13,16 @@
#include <Ecore.h>
#include <Ecore_Audio.h>
static Eina_Bool _failed_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Eina_Bool *pulse_context_failed = data;
if (pulse_context_failed) *pulse_context_failed = EINA_TRUE;
ecore_main_loop_quit();
return EINA_TRUE;
}
static Eina_Bool _finished_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
ecore_main_loop_quit();
@ -48,6 +58,7 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
{
Eo *in, *out;
Eina_Bool ret;
Eina_Bool pulse_context_failed = EINA_FALSE;
in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
fail_if(!in);
@ -62,11 +73,13 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
ecore_timer_add(0.3, _seek_vol, in);
eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _finished_cb, NULL));
eo_do(out, eo_event_callback_add(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL, _failed_cb, &pulse_context_failed));
eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
fail_if(!ret);
ecore_main_loop_begin();
fail_if(pulse_context_failed);
eo_del(out);
eo_del(in);