ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2024-12-22 23:55:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

PulseAudio: fix soundio_outstream_pause triggering assertion

Browse source 
when called from within write_callback. closes #24
This commit is contained in:
Andrew Kelley 2015-09-14 04:15:02 -07:00
parent 23104161a8
commit 7e95d9f9c0
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/pulseaudio.cpp
View file

@ -800,7 +800,9 @@ static int outstream_pause_pa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os, b
SoundIoOutStreamPulseAudio *ospa = &os->backend_data.pulseaudio; SoundIoOutStreamPulseAudio *ospa = &os->backend_data.pulseaudio;
SoundIoPulseAudio *sipa = &si->backend_data.pulseaudio; SoundIoPulseAudio *sipa = &si->backend_data.pulseaudio;
pa_threaded_mainloop_lock(sipa->main_loop); if (!pa_threaded_mainloop_in_thread(sipa->main_loop)) {
pa_threaded_mainloop_lock(sipa->main_loop);
}
if (pause != pa_stream_is_corked(ospa->stream)) { if (pause != pa_stream_is_corked(ospa->stream)) {
pa_operation *op = pa_stream_cork(ospa->stream, pause, NULL, NULL); pa_operation *op = pa_stream_cork(ospa->stream, pause, NULL, NULL);
@ -811,7 +813,9 @@ static int outstream_pause_pa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os, b
pa_operation_unref(op); pa_operation_unref(op);
} }
pa_threaded_mainloop_unlock(sipa->main_loop); if (!pa_threaded_mainloop_in_thread(sipa->main_loop)) {
pa_threaded_mainloop_unlock(sipa->main_loop);
}
return 0; return 0;
} }
@ -1026,7 +1030,9 @@ static int instream_pause_pa(SoundIoPrivate *si, SoundIoInStreamPrivate *is, boo
SoundIoInStreamPulseAudio *ispa = &is->backend_data.pulseaudio; SoundIoInStreamPulseAudio *ispa = &is->backend_data.pulseaudio;
SoundIoPulseAudio *sipa = &si->backend_data.pulseaudio; SoundIoPulseAudio *sipa = &si->backend_data.pulseaudio;
pa_threaded_mainloop_lock(sipa->main_loop); if (!pa_threaded_mainloop_in_thread(sipa->main_loop)) {
pa_threaded_mainloop_lock(sipa->main_loop);
}
if (pause != pa_stream_is_corked(ispa->stream)) { if (pause != pa_stream_is_corked(ispa->stream)) {
pa_operation *op = pa_stream_cork(ispa->stream, pause, NULL, NULL); pa_operation *op = pa_stream_cork(ispa->stream, pause, NULL, NULL);
@ -1035,7 +1041,9 @@ static int instream_pause_pa(SoundIoPrivate *si, SoundIoInStreamPrivate *is, boo
pa_operation_unref(op); pa_operation_unref(op);
} }
pa_threaded_mainloop_unlock(sipa->main_loop); if (!pa_threaded_mainloop_in_thread(sipa->main_loop)) {
pa_threaded_mainloop_unlock(sipa->main_loop);
}
return 0; return 0;
} }