enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Ecore_Audio: Avoid abort() in PulseAudio 

In some cases (stress test), pulseaudio fails to play a sound
and pa_stream_drain() returns NULL, making pa_operation_unref()
crash right after.
This commit is contained in:
Jean-Philippe Andre 2015-06-24 14:43:07 +09:00
parent 8c47364846
commit 6db0ff4229
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
View File

@ -184,6 +184,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
{
pa_stream *stream = NULL;
Eina_Bool ret2 = EINA_FALSE;
pa_operation *op;
eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_detach(in));
if (!ret2)
@ -192,8 +193,14 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
eo_do(in, stream = eo_key_data_get("pulse_data"));
pa_stream_set_write_callback(stream, NULL, NULL);
pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL));
op = pa_stream_drain(stream, _drain_cb, NULL);
if (!op)
{
ERR("Failed to drain PulseAudio stream.");
return EINA_FALSE;
}
pa_operation_unref(op);
return EINA_TRUE;
}