From 423e8b2f03fa76f066573ddd8a00d9e870c80def Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 21 Sep 2021 12:34:57 +0200 Subject: [PATCH] Revert "pipewire-alsa: Make it MT safe" This reverts commit f22dd9d781770d052f07e336345d8d964384be62. Obsolete now that pw_init and factory loading/unloading has been made thread safe. --- pipewire-alsa/alsa-plugins/pcm_pipewire.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pipewire-alsa/alsa-plugins/pcm_pipewire.c b/pipewire-alsa/alsa-plugins/pcm_pipewire.c index 1945a26f7..802ac025e 100644 --- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c +++ b/pipewire-alsa/alsa-plugins/pcm_pipewire.c @@ -33,8 +33,6 @@ #include #include -#include - #include #include @@ -56,8 +54,6 @@ #define MIN_PERIOD 64 -static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; - typedef struct { snd_pcm_ioplug_t io; @@ -165,9 +161,7 @@ static int snd_pcm_pipewire_close(snd_pcm_ioplug_t *io) { snd_pcm_pipewire_t *pw = io->private_data; pw_log_debug(NAME" %p:", pw); - pthread_mutex_lock(&lock); snd_pcm_pipewire_free(pw); - pthread_mutex_unlock(&lock); return 0; } @@ -1120,6 +1114,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) uint32_t flags = 0; int err; + pw_init(NULL, NULL); + if (strstr(pw_get_library_version(), "0.2") != NULL) + return -ENOTSUP; + snd_config_for_each(i, next, conf) { snd_config_t *n = snd_config_iterator_entry(i); const char *id; @@ -1195,17 +1193,9 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pipewire) return -EINVAL; } - pthread_mutex_lock(&lock); - pw_init(NULL, NULL); - if (strstr(pw_get_library_version(), "0.2") != NULL) { - pthread_mutex_unlock(&lock); - return -ENOTSUP; - } - err = snd_pcm_pipewire_open(pcmp, name, node_name, server_name, playback_node, capture_node, role, stream, mode, flags, rate, format, channels, period_bytes); - pthread_mutex_unlock(&lock); return err; }