Fix missing configuration mapping parameter in PulseAudio backend initialisation.

diff --git a/audio_pa.c b/audio_pa.c
index 998dbc271aea5c34aca405de73841a5073942a4e..a0c6afec9fa3a369171b5b53bbeb87cd7781c68c 100644 (file)
--- a/audio_pa.c
+++ b/audio_pa.c
@@ -504,9 +504,9 @@ static int init(__attribute__((unused)) int argc, __attribute__((unused)) char *
       config.pa_server = (char *)str;
     }
 
       config.pa_server = (char *)str;
     }
 

-    // get the default channel mapping setting basis -- native ("no") or pa ("yes").
+    // get the default channel mapping setting basis -- "alsa" or "pulseaudio".

 
 

-    if (config_lookup_non_empty_string(config.cfg, "pulseaudio", &default_channel_layouts)) {
+    if (config_lookup_non_empty_string(config.cfg, "pulseaudio.default_channel_layouts", &default_channel_layouts)) {

       if ((strcasecmp(default_channel_layouts, "alsa") == 0) ||
           (strcasecmp(default_channel_layouts, "pulseaudio") == 0)) {
         debug(1, "pulseaudio default_channel_layouts setting: \"%s\".", default_channel_layouts);
       if ((strcasecmp(default_channel_layouts, "alsa") == 0) ||
           (strcasecmp(default_channel_layouts, "pulseaudio") == 0)) {
         debug(1, "pulseaudio default_channel_layouts setting: \"%s\".", default_channel_layouts);

diff --git a/configure.ac b/configure.ac
index 501b6073862fc8d16f1db706e26f7da6299f10dd..d10990ab721a490da8da88ca538f17a1a7ee9ac5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.50])
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.50])

-AC_INIT([shairport-sync], [5.0.3], [4265913+mikebrady@users.noreply.github.com])
+AC_INIT([shairport-sync], [5.0.4], [4265913+mikebrady@users.noreply.github.com])

 : ${CFLAGS="-O3"}
 : ${CXXFLAGS="-O3"}
 AM_INIT_AUTOMAKE([subdir-objects])
 : ${CFLAGS="-O3"}
 : ${CXXFLAGS="-O3"}
 AM_INIT_AUTOMAKE([subdir-objects])