From 9de783f2bcb0423e0c3cd8d89304128f4c8e4624 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Thu, 25 Aug 2016 22:44:28 +0200 Subject: [PATCH] [pulseaudio] Update README and conf with Pulseaudio --- README.md | 12 +++++++++--- forked-daapd.conf | 7 ++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0f9fb780..16ffd8a5 100644 --- a/README.md +++ b/README.md @@ -219,9 +219,15 @@ by your ffmpeg/libav. See [MP3 network streaming](#MP3-network-streaming-(stream ## Local audio output -forked-daapd supports local audio output through ALSA. The server will try to -syncronize playback with AirPlay. You can adjust the syncronization in the -config file. +forked-daapd supports local audio output through ALSA or Pulseaudio. You can +set your preference in the config file. + +If you select ALSA, the server will try to syncronize playback with AirPlay. +You can adjust the syncronization in the config file. + +If you select Pulseaudio, the "card" setting in the config file has no effect. +Instead all soundcards detected by Pulseaudio will be listed as speakers by +forked-daapd. ## MP3 network streaming (streaming to iOS) diff --git a/forked-daapd.conf b/forked-daapd.conf index 06c4ec33..5a2b7250 100644 --- a/forked-daapd.conf +++ b/forked-daapd.conf @@ -156,16 +156,17 @@ audio { # Name - used in the speaker list in Remote nickname = "Computer" - # Type of the output (alsa or dummy) + # Type of the output (alsa, pulseaudio or dummy) # type = "alsa" - # Audio device name for local audio output + # Audio device name for local audio output - ALSA only # card = "default" - # Mixer channel to use for volume control - ALSA/Linux only + # Mixer channel to use for volume control - ALSA only # If not set, PCM will be used if available, otherwise Master. # mixer = "" + # Syncronization - ALSA only # If your local audio is out of sync with AirPlay, you can adjust this # value. Positive values correspond to moving local audio ahead, # negative correspond to delaying it. The unit is samples, where is