[pulseaudio-discuss] [PATCH v2 5/5] fix a call to pa_sink_suspend() from an incorrect thread
Tanu Kaskinen
tanuk at iki.fi
Tue Mar 13 17:40:40 UTC 2018
The alsa sink calls pa_sink_suspend() from the set_port() callback.
pa_sink_suspend() can only be called from the main thread, but the
set_port() callback was often called from the IO thread. That caused an
assertion to be hit in pa_sink_suspend() when switching ports.
Another issue was that pa_sink_suspend() called the set_port() callback,
and if the callback calls pa_sink_suspend() again recursively, nothing
good can be expected from that, so the thread mismatch was not the only
problem.
This patch moves the mixer syncing logic out of pa_sink/source_suspend()
to be handled internally by the alsa sink/source. This removes the
recursive pa_sink_suspend() call. This also removes the need to have the
mixer_dirty flag in pa_sink/source, so the flag and the
pa_sink/source_set_mixer_dirty() functions can be removed.
This patch also changes the threading rules of set_port(). Previously it
was called sometimes from the main thread and sometimes from the IO
thread. Now it's always called from the main thread. When deferred
volumes are used, the alsa sink and source still have to update the
mixer from the IO thread when switching ports, but the thread
synchronization is now handled internally by the alsa sink and source.
The SET_PORT messages are not needed any more and can be removed.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104761
---
src/modules/alsa/alsa-sink.c | 94 +++++++++++++++++++++++++++++++++---------
src/modules/alsa/alsa-source.c | 94 +++++++++++++++++++++++++++++++++---------
src/pulsecore/sink.c | 52 +----------------------
src/pulsecore/sink.h | 7 +---
src/pulsecore/source.c | 52 +----------------------
src/pulsecore/source.h | 7 +---
6 files changed, 156 insertions(+), 150 deletions(-)
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 3b962b90e..afdf81358 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -161,6 +161,10 @@ struct userdata {
pa_alsa_ucm_mapping_context *ucm_context;
};
+enum {
+ SINK_MESSAGE_SYNC_MIXER = PA_SINK_MESSAGE_MAX
+};
+
static void userdata_free(struct userdata *u);
/* FIXME: Is there a better way to do this than device names? */
@@ -1168,6 +1172,43 @@ fail:
return -PA_ERR_IO;
}
+/* Called from the IO thread or the main thread depending on whether deferred
+ * volume is enabled or not (with deferred volume all mixer handling is done
+ * from the IO thread).
+ *
+ * Sets the mixer settings to match the current sink and port state (the port
+ * is given as an argument, because active_port may still point to the old
+ * port, if we're switching ports). */
+static void sync_mixer(struct userdata *u, pa_device_port *port) {
+ pa_alsa_setting *setting = NULL;
+
+ pa_assert(u);
+
+ if (!u->mixer_path)
+ return;
+
+ /* port may be NULL, because if we use a synthesized mixer path, then the
+ * sink has no ports. */
+ if (port) {
+ pa_alsa_port_data *data;
+
+ data = PA_DEVICE_PORT_DATA(port);
+ setting = data->setting;
+ }
+
+ pa_alsa_path_select(u->mixer_path, setting, u->mixer_handle, u->sink->muted);
+
+ if (u->sink->set_mute)
+ u->sink->set_mute(u->sink);
+ if (u->sink->flags & PA_SINK_DEFERRED_VOLUME) {
+ if (u->sink->write_volume)
+ u->sink->write_volume(u->sink);
+ } else {
+ if (u->sink->set_volume)
+ u->sink->set_volume(u->sink);
+ }
+}
+
/* Called from IO context */
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;
@@ -1184,6 +1225,13 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
return 0;
}
+
+ case SINK_MESSAGE_SYNC_MIXER: {
+ pa_device_port *port = data;
+
+ sync_mixer(u, port);
+ return 0;
+ }
}
return pa_sink_process_msg(o, code, data, offset, chunk);
@@ -1197,6 +1245,16 @@ static int sink_set_state_in_main_thread_cb(pa_sink *s, pa_sink_state_t new_stat
pa_sink_assert_ref(s);
pa_assert_se(u = s->userdata);
+ /* When our session becomes active, we need to sync the mixer, because
+ * another user may have changed the mixer settings.
+ *
+ * If deferred volume is enabled, the syncing is done in the
+ * set_state_in_io_thread() callback instead. */
+ if (!(s->flags & PA_SINK_DEFERRED_VOLUME)
+ && (s->suspend_cause & PA_SUSPEND_SESSION)
+ && !(new_suspend_cause & PA_SUSPEND_SESSION))
+ sync_mixer(u, s->active_port);
+
old_state = pa_sink_get_state(u->sink);
if (PA_SINK_IS_OPENED(old_state) && new_state == PA_SINK_SUSPENDED)
@@ -1215,8 +1273,18 @@ static int sink_set_state_in_io_thread_cb(pa_sink *s, pa_sink_state_t new_state,
pa_assert(s);
pa_assert_se(u = s->userdata);
+ /* When our session becomes active, we need to sync the mixer, because
+ * another user may have changed the mixer settings.
+ *
+ * If deferred volume is disabled, the syncing is done in the
+ * set_state_in_main_thread() callback instead. */
+ if ((s->flags & PA_SINK_DEFERRED_VOLUME)
+ && (s->suspend_cause & PA_SUSPEND_SESSION)
+ && !(new_suspend_cause & PA_SUSPEND_SESSION))
+ sync_mixer(u, s->active_port);
+
/* It may be that only the suspend cause is changing, in which case there's
- * nothing to do. */
+ * nothing more to do. */
if (new_state == s->thread_info.state)
return 0;
@@ -1273,10 +1341,8 @@ static int ctl_mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
if (!PA_SINK_IS_LINKED(u->sink->state))
return 0;
- if (u->sink->suspend_cause & PA_SUSPEND_SESSION) {
- pa_sink_set_mixer_dirty(u->sink, true);
+ if (u->sink->suspend_cause & PA_SUSPEND_SESSION)
return 0;
- }
if (mask & SND_CTL_EVENT_MASK_VALUE) {
pa_sink_get_volume(u->sink, true);
@@ -1295,10 +1361,8 @@ static int io_mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
if (mask == SND_CTL_EVENT_MASK_REMOVE)
return 0;
- if (u->sink->suspend_cause & PA_SUSPEND_SESSION) {
- pa_sink_set_mixer_dirty(u->sink, true);
+ if (u->sink->suspend_cause & PA_SUSPEND_SESSION)
return 0;
- }
if (mask & SND_CTL_EVENT_MASK_VALUE)
pa_sink_update_volume_and_mute(u->sink);
@@ -1522,21 +1586,13 @@ static int sink_set_port_cb(pa_sink *s, pa_device_port *p) {
pa_assert(u->mixer_handle);
data = PA_DEVICE_PORT_DATA(p);
-
pa_assert_se(u->mixer_path = data->path);
- pa_alsa_path_select(u->mixer_path, data->setting, u->mixer_handle, s->muted);
-
mixer_volume_init(u);
- if (s->set_mute)
- s->set_mute(s);
- if (s->flags & PA_SINK_DEFERRED_VOLUME) {
- if (s->write_volume)
- s->write_volume(s);
- } else {
- if (s->set_volume)
- s->set_volume(s);
- }
+ if (s->flags & PA_SINK_DEFERRED_VOLUME)
+ pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_SYNC_MIXER, p, 0, NULL);
+ else
+ sync_mixer(u, p);
if (data->suspend_when_unavailable && p->available == PA_AVAILABLE_NO)
pa_sink_suspend(s, true, PA_SUSPEND_UNAVAILABLE);
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 69da88dab..73c2a2594 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -143,6 +143,10 @@ struct userdata {
pa_alsa_ucm_mapping_context *ucm_context;
};
+enum {
+ SOURCE_MESSAGE_SYNC_MIXER = PA_SOURCE_MESSAGE_MAX
+};
+
static void userdata_free(struct userdata *u);
static pa_hook_result_t reserve_cb(pa_reserve_wrapper *r, void *forced, struct userdata *u) {
@@ -1023,6 +1027,43 @@ fail:
return -PA_ERR_IO;
}
+/* Called from the IO thread or the main thread depending on whether deferred
+ * volume is enabled or not (with deferred volume all mixer handling is done
+ * from the IO thread).
+ *
+ * Sets the mixer settings to match the current source and port state (the port
+ * is given as an argument, because active_port may still point to the old
+ * port, if we're switching ports). */
+static void sync_mixer(struct userdata *u, pa_device_port *port) {
+ pa_alsa_setting *setting = NULL;
+
+ pa_assert(u);
+
+ if (!u->mixer_path)
+ return;
+
+ /* port may be NULL, because if we use a synthesized mixer path, then the
+ * source has no ports. */
+ if (port) {
+ pa_alsa_port_data *data;
+
+ data = PA_DEVICE_PORT_DATA(port);
+ setting = data->setting;
+ }
+
+ pa_alsa_path_select(u->mixer_path, setting, u->mixer_handle, u->source->muted);
+
+ if (u->source->set_mute)
+ u->source->set_mute(u->source);
+ if (u->source->flags & PA_SOURCE_DEFERRED_VOLUME) {
+ if (u->source->write_volume)
+ u->source->write_volume(u->source);
+ } else {
+ if (u->source->set_volume)
+ u->source->set_volume(u->source);
+ }
+}
+
/* Called from IO context */
static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
struct userdata *u = PA_SOURCE(o)->userdata;
@@ -1039,6 +1080,13 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
return 0;
}
+
+ case SOURCE_MESSAGE_SYNC_MIXER: {
+ pa_device_port *port = data;
+
+ sync_mixer(u, port);
+ return 0;
+ }
}
return pa_source_process_msg(o, code, data, offset, chunk);
@@ -1052,6 +1100,16 @@ static int source_set_state_in_main_thread_cb(pa_source *s, pa_source_state_t ne
pa_source_assert_ref(s);
pa_assert_se(u = s->userdata);
+ /* When our session becomes active, we need to sync the mixer, because
+ * another user may have changed the mixer settings.
+ *
+ * If deferred volume is enabled, the syncing is done in the
+ * set_state_in_io_thread() callback instead. */
+ if (!(s->flags & PA_SOURCE_DEFERRED_VOLUME)
+ && (s->suspend_cause & PA_SUSPEND_SESSION)
+ && !(new_suspend_cause & PA_SUSPEND_SESSION))
+ sync_mixer(u, s->active_port);
+
old_state = pa_source_get_state(u->source);
if (PA_SOURCE_IS_OPENED(old_state) && new_state == PA_SOURCE_SUSPENDED)
@@ -1070,8 +1128,18 @@ static int source_set_state_in_io_thread_cb(pa_source *s, pa_source_state_t new_
pa_assert(s);
pa_assert_se(u = s->userdata);
+ /* When our session becomes active, we need to sync the mixer, because
+ * another user may have changed the mixer settings.
+ *
+ * If deferred volume is disabled, the syncing is done in the
+ * set_state_in_main_thread() callback instead. */
+ if ((s->flags & PA_SOURCE_DEFERRED_VOLUME)
+ && (s->suspend_cause & PA_SUSPEND_SESSION)
+ && !(new_suspend_cause & PA_SUSPEND_SESSION))
+ sync_mixer(u, s->active_port);
+
/* It may be that only the suspend cause is changing, in which case there's
- * nothing to do. */
+ * nothing more to do. */
if (new_state == s->thread_info.state)
return 0;
@@ -1128,10 +1196,8 @@ static int ctl_mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
if (!PA_SOURCE_IS_LINKED(u->source->state))
return 0;
- if (u->source->suspend_cause & PA_SUSPEND_SESSION) {
- pa_source_set_mixer_dirty(u->source, true);
+ if (u->source->suspend_cause & PA_SUSPEND_SESSION)
return 0;
- }
if (mask & SND_CTL_EVENT_MASK_VALUE) {
pa_source_get_volume(u->source, true);
@@ -1150,10 +1216,8 @@ static int io_mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
if (mask == SND_CTL_EVENT_MASK_REMOVE)
return 0;
- if (u->source->suspend_cause & PA_SUSPEND_SESSION) {
- pa_source_set_mixer_dirty(u->source, true);
+ if (u->source->suspend_cause & PA_SUSPEND_SESSION)
return 0;
- }
if (mask & SND_CTL_EVENT_MASK_VALUE)
pa_source_update_volume_and_mute(u->source);
@@ -1377,21 +1441,13 @@ static int source_set_port_cb(pa_source *s, pa_device_port *p) {
pa_assert(u->mixer_handle);
data = PA_DEVICE_PORT_DATA(p);
-
pa_assert_se(u->mixer_path = data->path);
- pa_alsa_path_select(u->mixer_path, data->setting, u->mixer_handle, s->muted);
-
mixer_volume_init(u);
- if (s->set_mute)
- s->set_mute(s);
- if (s->flags & PA_SOURCE_DEFERRED_VOLUME) {
- if (s->write_volume)
- s->write_volume(s);
- } else {
- if (s->set_volume)
- s->set_volume(s);
- }
+ if (s->flags & PA_SOURCE_DEFERRED_VOLUME)
+ pa_asyncmsgq_send(u->source->asyncmsgq, PA_MSGOBJECT(u->source), SOURCE_MESSAGE_SYNC_MIXER, p, 0, NULL);
+ else
+ sync_mixer(u, p);
return 0;
}
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index f9eb42ecc..6ff3205ee 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -64,11 +64,6 @@ struct pa_sink_volume_change {
PA_LLIST_FIELDS(pa_sink_volume_change);
};
-struct sink_message_set_port {
- pa_device_port *port;
- int ret;
-};
-
struct set_state_data {
pa_sink_state_t state;
pa_suspend_cause_t suspend_cause;
@@ -259,7 +254,6 @@ pa_sink* pa_sink_new(
s->flags = flags;
s->priority = 0;
s->suspend_cause = data->suspend_cause;
- pa_sink_set_mixer_dirty(s, false);
s->name = pa_xstrdup(name);
s->proplist = pa_proplist_copy(data->proplist);
s->driver = pa_xstrdup(pa_path_get_filename(data->driver));
@@ -895,11 +889,6 @@ int pa_sink_update_status(pa_sink*s) {
return sink_set_state(s, pa_sink_used_by(s) ? PA_SINK_RUNNING : PA_SINK_IDLE, 0);
}
-/* Called from any context - must be threadsafe */
-void pa_sink_set_mixer_dirty(pa_sink *s, bool is_dirty) {
- pa_atomic_store(&s->mixer_dirty, is_dirty ? 1 : 0);
-}
-
/* Called from main context */
int pa_sink_suspend(pa_sink *s, bool suspend, pa_suspend_cause_t cause) {
pa_suspend_cause_t merged_cause;
@@ -914,27 +903,6 @@ int pa_sink_suspend(pa_sink *s, bool suspend, pa_suspend_cause_t cause) {
else
merged_cause = s->suspend_cause & ~cause;
- if (!(merged_cause & PA_SUSPEND_SESSION) && (pa_atomic_load(&s->mixer_dirty) != 0)) {
- /* This might look racy but isn't: If somebody sets mixer_dirty exactly here,
- it'll be handled just fine. */
- pa_sink_set_mixer_dirty(s, false);
- pa_log_debug("Mixer is now accessible. Updating alsa mixer settings.");
- if (s->active_port && s->set_port) {
- if (s->flags & PA_SINK_DEFERRED_VOLUME) {
- struct sink_message_set_port msg = { .port = s->active_port, .ret = 0 };
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_PORT, &msg, 0, NULL) == 0);
- }
- else
- s->set_port(s, s->active_port);
- }
- else {
- if (s->set_mute)
- s->set_mute(s);
- if (s->set_volume)
- s->set_volume(s);
- }
- }
-
if (merged_cause)
return sink_set_state(s, PA_SINK_SUSPENDED, merged_cause);
else
@@ -2967,15 +2935,6 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
pa_sink_set_max_request_within_thread(s, (size_t) offset);
return 0;
- case PA_SINK_MESSAGE_SET_PORT:
-
- pa_assert(userdata);
- if (s->set_port) {
- struct sink_message_set_port *msg_data = userdata;
- msg_data->ret = s->set_port(s, msg_data->port);
- }
- return 0;
-
case PA_SINK_MESSAGE_UPDATE_VOLUME_AND_MUTE:
/* This message is sent from IO-thread and handled in main thread. */
pa_assert_ctl_context();
@@ -3430,7 +3389,6 @@ size_t pa_sink_get_max_request(pa_sink *s) {
/* Called from main context */
int pa_sink_set_port(pa_sink *s, const char *name, bool save) {
pa_device_port *port;
- int ret;
pa_sink_assert_ref(s);
pa_assert_ctl_context();
@@ -3451,15 +3409,7 @@ int pa_sink_set_port(pa_sink *s, const char *name, bool save) {
return 0;
}
- if (s->flags & PA_SINK_DEFERRED_VOLUME) {
- struct sink_message_set_port msg = { .port = port, .ret = 0 };
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_PORT, &msg, 0, NULL) == 0);
- ret = msg.ret;
- }
- else
- ret = s->set_port(s, port);
-
- if (ret < 0)
+ if (s->set_port(s, port) < 0)
return -PA_ERR_NOENTITY;
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index 3e9191d27..abf2d9244 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -115,7 +115,6 @@ struct pa_sink {
pa_hashmap *ports;
pa_device_port *active_port;
- pa_atomic_t mixer_dirty;
/* The latency offset is inherited from the currently active port */
int64_t port_latency_offset;
@@ -251,8 +250,8 @@ struct pa_sink {
* thread context. */
pa_sink_cb_t update_requested_latency; /* may be NULL */
- /* Called whenever the port shall be changed. Called from IO
- * thread if deferred volumes are enabled, and main thread otherwise. */
+ /* Called whenever the port shall be changed. Called from the main
+ * thread. */
int (*set_port)(pa_sink *s, pa_device_port *port); /* may be NULL */
/* Called to get the list of formats supported by the sink, sorted
@@ -356,7 +355,6 @@ typedef enum pa_sink_message {
PA_SINK_MESSAGE_GET_MAX_REQUEST,
PA_SINK_MESSAGE_SET_MAX_REWIND,
PA_SINK_MESSAGE_SET_MAX_REQUEST,
- PA_SINK_MESSAGE_SET_PORT,
PA_SINK_MESSAGE_UPDATE_VOLUME_AND_MUTE,
PA_SINK_MESSAGE_SET_PORT_LATENCY_OFFSET,
PA_SINK_MESSAGE_MAX
@@ -483,7 +481,6 @@ bool pa_sink_get_mute(pa_sink *sink, bool force_refresh);
bool pa_sink_update_proplist(pa_sink *s, pa_update_mode_t mode, pa_proplist *p);
int pa_sink_set_port(pa_sink *s, const char *name, bool save);
-void pa_sink_set_mixer_dirty(pa_sink *s, bool is_dirty);
unsigned pa_sink_linked_by(pa_sink *s); /* Number of connected streams */
unsigned pa_sink_used_by(pa_sink *s); /* Number of connected streams which are not corked */
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 6c5699e09..a893e9fb9 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -56,11 +56,6 @@ struct pa_source_volume_change {
PA_LLIST_FIELDS(pa_source_volume_change);
};
-struct source_message_set_port {
- pa_device_port *port;
- int ret;
-};
-
struct set_state_data {
pa_source_state_t state;
pa_suspend_cause_t suspend_cause;
@@ -246,7 +241,6 @@ pa_source* pa_source_new(
s->flags = flags;
s->priority = 0;
s->suspend_cause = data->suspend_cause;
- pa_source_set_mixer_dirty(s, false);
s->name = pa_xstrdup(name);
s->proplist = pa_proplist_copy(data->proplist);
s->driver = pa_xstrdup(pa_path_get_filename(data->driver));
@@ -816,11 +810,6 @@ int pa_source_update_status(pa_source*s) {
return source_set_state(s, pa_source_used_by(s) ? PA_SOURCE_RUNNING : PA_SOURCE_IDLE, 0);
}
-/* Called from any context - must be threadsafe */
-void pa_source_set_mixer_dirty(pa_source *s, bool is_dirty) {
- pa_atomic_store(&s->mixer_dirty, is_dirty ? 1 : 0);
-}
-
/* Called from main context */
int pa_source_suspend(pa_source *s, bool suspend, pa_suspend_cause_t cause) {
pa_suspend_cause_t merged_cause;
@@ -838,27 +827,6 @@ int pa_source_suspend(pa_source *s, bool suspend, pa_suspend_cause_t cause) {
else
merged_cause = s->suspend_cause & ~cause;
- if (!(merged_cause & PA_SUSPEND_SESSION) && (pa_atomic_load(&s->mixer_dirty) != 0)) {
- /* This might look racy but isn't: If somebody sets mixer_dirty exactly here,
- it'll be handled just fine. */
- pa_source_set_mixer_dirty(s, false);
- pa_log_debug("Mixer is now accessible. Updating alsa mixer settings.");
- if (s->active_port && s->set_port) {
- if (s->flags & PA_SOURCE_DEFERRED_VOLUME) {
- struct source_message_set_port msg = { .port = s->active_port, .ret = 0 };
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_PORT, &msg, 0, NULL) == 0);
- }
- else
- s->set_port(s, s->active_port);
- }
- else {
- if (s->set_mute)
- s->set_mute(s);
- if (s->set_volume)
- s->set_volume(s);
- }
- }
-
if (merged_cause)
return source_set_state(s, PA_SOURCE_SUSPENDED, merged_cause);
else
@@ -2336,15 +2304,6 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
/* Implementors need to overwrite this implementation! */
return -1;
- case PA_SOURCE_MESSAGE_SET_PORT:
-
- pa_assert(userdata);
- if (s->set_port) {
- struct source_message_set_port *msg_data = userdata;
- msg_data->ret = s->set_port(s, msg_data->port);
- }
- return 0;
-
case PA_SOURCE_MESSAGE_UPDATE_VOLUME_AND_MUTE:
/* This message is sent from IO-thread and handled in main thread. */
pa_assert_ctl_context();
@@ -2713,7 +2672,6 @@ size_t pa_source_get_max_rewind(pa_source *s) {
/* Called from main context */
int pa_source_set_port(pa_source *s, const char *name, bool save) {
pa_device_port *port;
- int ret;
pa_source_assert_ref(s);
pa_assert_ctl_context();
@@ -2734,15 +2692,7 @@ int pa_source_set_port(pa_source *s, const char *name, bool save) {
return 0;
}
- if (s->flags & PA_SOURCE_DEFERRED_VOLUME) {
- struct source_message_set_port msg = { .port = port, .ret = 0 };
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_PORT, &msg, 0, NULL) == 0);
- ret = msg.ret;
- }
- else
- ret = s->set_port(s, port);
-
- if (ret < 0)
+ if (s->set_port(s, port) < 0)
return -PA_ERR_NOENTITY;
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
index 96327165d..b0fa608de 100644
--- a/src/pulsecore/source.h
+++ b/src/pulsecore/source.h
@@ -116,7 +116,6 @@ struct pa_source {
pa_hashmap *ports;
pa_device_port *active_port;
- pa_atomic_t mixer_dirty;
/* The latency offset is inherited from the currently active port */
int64_t port_latency_offset;
@@ -215,8 +214,8 @@ struct pa_source {
* thread context. */
pa_source_cb_t update_requested_latency; /* may be NULL */
- /* Called whenever the port shall be changed. Called from IO
- * thread if deferred volumes are enabled, and main thread otherwise. */
+ /* Called whenever the port shall be changed. Called from the main
+ * thread. */
int (*set_port)(pa_source *s, pa_device_port *port); /*ditto */
/* Called to get the list of formats supported by the source, sorted
@@ -294,7 +293,6 @@ typedef enum pa_source_message {
PA_SOURCE_MESSAGE_GET_FIXED_LATENCY,
PA_SOURCE_MESSAGE_GET_MAX_REWIND,
PA_SOURCE_MESSAGE_SET_MAX_REWIND,
- PA_SOURCE_MESSAGE_SET_PORT,
PA_SOURCE_MESSAGE_UPDATE_VOLUME_AND_MUTE,
PA_SOURCE_MESSAGE_SET_PORT_LATENCY_OFFSET,
PA_SOURCE_MESSAGE_MAX
@@ -415,7 +413,6 @@ bool pa_source_get_mute(pa_source *source, bool force_refresh);
bool pa_source_update_proplist(pa_source *s, pa_update_mode_t mode, pa_proplist *p);
int pa_source_set_port(pa_source *s, const char *name, bool save);
-void pa_source_set_mixer_dirty(pa_source *s, bool is_dirty);
int pa_source_reconfigure(pa_source *s, pa_sample_spec *spec, bool passthrough);
--
2.16.1
More information about the pulseaudio-discuss
mailing list