I've pushed these two now. There is still the open question/issue of whether we should merge all four locations, but I think that can be discussed/resolved later and this is still a good improvement.

Thanks!

// David

On 2015-12-07 22:22, Tanu Kaskinen wrote:
Earlier discussions:
  - v1: http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/23592
  - v2: http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/24578

Changes in v3:
  - Load the .d files after, not before, the main file.

Changes  v2:
  - Split the original patch into two parts.
  - Added documentation to the man pages.
  - Changed a debug message about non-existent .d directory from
      "scandir(\"%s\") failed: %s", dir_name, pa_cstrerror(errno)
    to
      "%s does not exist, ignoring.", dir_name

Tanu Kaskinen (2):
   conf-parser: add support for .d directories
   client-conf, daemon-conf: enable .d directories

  man/pulse-client.conf.5.xml.in          | 19 +++++++++++----
  man/pulse-daemon.conf.5.xml.in          | 25 ++++++++++++++------
  src/daemon/daemon-conf.c                |  2 +-
  src/modules/alsa/alsa-mixer.c           |  4 ++--
  src/modules/module-augment-properties.c |  2 +-
  src/pulse/client-conf.c                 |  2 +-
  src/pulsecore/conf-parser.c             | 42 +++++++++++++++++++++++++++++++--
  src/pulsecore/conf-parser.h             |  8 ++++++-
  8 files changed, 85 insertions(+), 19 deletions(-)


--
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic
_______________________________________________
pulseaudio-discuss mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss

Reply via email to