mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

oss: don't deadlock when we try to resume an OSS device that lacks a mixer

Browse source
This commit is contained in:
Lennart Poettering 2009-05-26 22:30:36 +02:00
parent d2198c9ba1
commit e8f7eb616a
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/oss/module-oss.c
View file

@ -477,6 +477,7 @@ static void build_pollfd(struct userdata *u) {
pollfd->revents = 0; pollfd->revents = 0;
} }
/* Called from IO context */
static int suspend(struct userdata *u) { static int suspend(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert(u->fd >= 0); pa_assert(u->fd >= 0);
@ -526,6 +527,7 @@ static int suspend(struct userdata *u) {
return 0; return 0;
} }
/* Called from IO context */
static int unsuspend(struct userdata *u) { static int unsuspend(struct userdata *u) {
int m; int m;
pa_sample_spec ss, *ss_original; pa_sample_spec ss, *ss_original;
@ -616,10 +618,10 @@ static int unsuspend(struct userdata *u) {
build_pollfd(u); build_pollfd(u);
if (u->sink) if (u->sink && u->sink->get_volume)
pa_sink_get_volume(u->sink, TRUE, FALSE); u->sink->get_volume(u->sink);
if (u->source) if (u->source && u->source->get_volume)
pa_source_get_volume(u->source, TRUE); u->source->get_volume(u->source);
pa_log_info("Resumed successfully..."); pa_log_info("Resumed successfully...");
@ -631,6 +633,7 @@ fail:
return -1; return -1;
} }
/* Called from IO context */
static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
struct userdata *u = PA_SINK(o)->userdata; struct userdata *u = PA_SINK(o)->userdata;
int ret; int ret;