From 10207456f0c43d95b146fc6a2f1023b40945e636 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 12 Nov 2020 16:50:24 +0100 Subject: [PATCH] media-session: don't start pulse-bridge automatically Don't start the pulse-bridge automatically because we don't know what socket to listen on. Also, listen by default on a safe socket, not used by pulseaudio. --- src/examples/media-session/media-session.c | 3 +-- src/modules/module-protocol-pulse/pulse-server.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index 0522014eb..d42fb6bcd 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -2080,8 +2080,7 @@ static void do_quit(void *data, int signal_number) "alsa-seq," \ "v4l2," \ "suspend-node," \ - "policy-node," \ - "pulse-bridge" + "policy-node" #define EXTRA_ENABLED "" #define EXTRA_DISABLED "" diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index a40c7ba6b..889c4b89c 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -4655,8 +4655,7 @@ struct pw_protocol_pulse *pw_protocol_pulse_new(struct pw_context *context, if (props != NULL) str = pw_properties_get(props, "server.address"); if (str == NULL) { - str = free_str = spa_aprintf("%s,%s-%s", - PW_PROTOCOL_PULSE_DEFAULT_SERVER, + str = free_str = spa_aprintf("%s-%s", PW_PROTOCOL_PULSE_DEFAULT_SERVER, get_server_name(context)); }