From 540d7716483190502ee21505727cc6f99a2868f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Scherer Date: Sun, 5 Nov 2017 05:59:56 +0100 Subject: [PATCH 1/2] [pulseaudio] allow specification of pulseaudio server --- forked-daapd.conf.in | 6 ++++++ src/conffile.c | 1 + src/outputs/pulse.c | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/forked-daapd.conf.in b/forked-daapd.conf.in index 95e89a15..4305f68a 100644 --- a/forked-daapd.conf.in +++ b/forked-daapd.conf.in @@ -177,6 +177,12 @@ audio { # Type of the output (alsa, pulseaudio, dummy or disabled) # type = "alsa" + # For pulseaudio output, an optional server can be specified. + # See http://billauer.co.il/blog/2014/01/pa-multiple-users/ + # for an example how to set up access to the daemon started + # by a logged-in user. +# server = "localhost" + # Audio PCM device name for local audio output - ALSA only # card = "default" diff --git a/src/conffile.c b/src/conffile.c index f5bc7885..0db89299 100644 --- a/src/conffile.c +++ b/src/conffile.c @@ -104,6 +104,7 @@ static cfg_opt_t sec_audio[] = { CFG_STR("nickname", "Computer", CFGF_NONE), CFG_STR("type", NULL, CFGF_NONE), + CFG_STR("server", NULL, CFGF_NONE), CFG_STR("card", "default", CFGF_NONE), CFG_STR("mixer", NULL, CFGF_NONE), CFG_STR("mixer_device", NULL, CFGF_NONE), diff --git a/src/outputs/pulse.c b/src/outputs/pulse.c index b41a27ab..86e23cea 100644 --- a/src/outputs/pulse.c +++ b/src/outputs/pulse.c @@ -891,6 +891,7 @@ static int pulse_init(void) { char *type; + char *server; int state; int ret; @@ -898,6 +899,8 @@ pulse_init(void) if (type && (strcasecmp(type, "pulseaudio") != 0)) return -1; + server = cfg_getstr(cfg_getsec(cfg, "audio"), "server"); + ret = 0; if (!(pulse.mainloop = pa_threaded_mainloop_new())) @@ -914,8 +917,8 @@ pulse_init(void) goto fail; pa_context_set_state_callback(pulse.context, context_state_cb, NULL); - - if (pa_context_connect(pulse.context, NULL, 0, NULL) < 0) + + if (pa_context_connect(pulse.context, server, 0, NULL) < 0) { ret = pa_context_errno(pulse.context); goto fail; From bd95d2293a29b1a867aaae388fe4620f4ab1fd2a Mon Sep 17 00:00:00 2001 From: Wolfgang Scherer Date: Sun, 5 Nov 2017 20:33:53 +0100 Subject: [PATCH 2/2] [pulseaudio] Description of recommended desktop setup moved to README_PULSE.md --- README_PULSE.md | 68 +++++++++++++++++++++++++++++++++++++++----- forked-daapd.conf.in | 8 ++---- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/README_PULSE.md b/README_PULSE.md index 24f9c6d0..c6f3363f 100644 --- a/README_PULSE.md +++ b/README_PULSE.md @@ -1,11 +1,66 @@ # forked-daapd and Pulseaudio Credit: [Rob Pope](http://robpope.co.uk/blog/post/setting-up-forked-daapd-with-bluetooth) +System mode is generally only recommended for headless servers, i.e., +systems without desktop users. + + +## User Mode with Network Access + +If there is a desktop user logged in most of the time, a setup with +[network access via localhost +only](http://billauer.co.il/blog/2014/01/pa-multiple-users/) +for daemons is a more appropriate solution, since the normal user +administration (with, e.g., `pulseaudio -k`) works as +advertised. Also, the user specific configuration for pulseaudio is +preserved across sessions as expected. + +Quoting from the above blog, the necessary setup (per user) boils down +to: + + +### Step1: Copy system pulseaudio configuration to the users home directory + +``` +mkdir -p ~/.pulse +cp /etc/pulse/default.pa ~/.pulse/ +``` + + +### Step 2: Enable TCP access from localhost only + +Edit the file `~/.pulse/default.pa` , adding the following line at the end: + +``` +load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1 +``` + + +### Step 3: Restart the pulseaudio deamon + +``` +pulseaudio -k +# OR +pulseaudio -D +``` + + +### Step 4: + +In the `audio` section of `/etc/forked-daapd.conf`, set `server` to `localhost`: + +``` +server = "localhost" +``` + + +## System Mode + This guide was written based on headless Debian Jessie platforms. Most of the instructions will require that you are root. -## Step 1: Setting up Pulseaudio in system mode with Bluetooth support +### Step 1: Setting up Pulseaudio in system mode with Bluetooth support If you see a "Connection refused" error when starting forked-daapd, then you will probably need to setup Pulseaudio to run in system mode [1]. This means @@ -30,12 +85,12 @@ WantedBy=multi-user.target ``` If you want Bluetooth support, you must also configure Pulseaudio to load the -Bluetooth module. First install it (Debian: +Bluetooth module. First install it (Debian: `apt install pulseaudio-module-bluetooth`) and then add the following to /etc/pulse/system.pa: ``` -### Enable Bluetooth +#### Enable Bluetooth .ifexists module-bluetooth-discover.so load-module module-bluetooth-discover .endif @@ -55,7 +110,7 @@ Phew, almost done with Pulseaudio! Now you should: 3. check that the Bluetooth module is loaded with `pactl list modules short` -## Step 2: Setting up forked-daapd +### Step 2: Setting up forked-daapd Add the user forked-daapd is running as (typically "daapd") to the "pulse-access" group: @@ -67,7 +122,7 @@ adduser daapd pulse-access Now (re)start forked-daapd. -## Step 3: Adding a Bluetooth device +### Step 3: Adding a Bluetooth device To connect with the device, run `bluetoothctl` and then: @@ -82,11 +137,10 @@ trust [MAC address] connect [MAC address] ``` -Now the speaker should appear in forked-daapd. You can also verify that +Now the speaker should appear in forked-daapd. You can also verify that Pulseaudio has detected the speaker with `pactl list sinks short`. --- [1] Note that Pulseaudio will warn against system mode. However, in this use case it is actually the solution recommended by the [Pulseaudio folks themselves](https://lists.freedesktop.org/archives/pulseaudio-discuss/2016-August/026823.html). - diff --git a/forked-daapd.conf.in b/forked-daapd.conf.in index 4305f68a..91606d26 100644 --- a/forked-daapd.conf.in +++ b/forked-daapd.conf.in @@ -177,11 +177,9 @@ audio { # Type of the output (alsa, pulseaudio, dummy or disabled) # type = "alsa" - # For pulseaudio output, an optional server can be specified. - # See http://billauer.co.il/blog/2014/01/pa-multiple-users/ - # for an example how to set up access to the daemon started - # by a logged-in user. -# server = "localhost" + # For pulseaudio output, an optional server can be specified. + # If not set, connection is made via local socket. +# server = "" # Audio PCM device name for local audio output - ALSA only # card = "default"