diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2015-12-07 23:22:41 +0200 |
|---|---|---|
| committer | David Henningsson <david.henningsson@canonical.com> | 2015-12-14 13:45:39 +0100 |
| commit | 1d7ce901398b4e65bfac991aa7a351ac15c4910e (patch) | |
| tree | 25275d8b6d20f8f86ca307a5418d3b02e0123373 /src/daemon | |
| parent | d97460045ceb71a0c3541c2753bb7fe519950285 (diff) | |
| download | pulseaudio-1d7ce901398b4e65bfac991aa7a351ac15c4910e.tar.gz | |
conf-parser: add support for .d directories
This allows a configuration scheme where after loading configuration
from "somefile", the parser loads configuration from files in
directory "somefile.d". This feature needs to be enabled on a per-file
basis, though, and this patch doesn't yet enable the feature for any
files.
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon-conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index f94cdebf4..306c8cbfa 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -617,7 +617,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) { ci.default_channel_map_set = ci.default_sample_spec_set = false; ci.conf = c; - r = f ? pa_config_parse(c->config_file, f, table, NULL, NULL) : 0; + r = f ? pa_config_parse(c->config_file, f, table, NULL, false, NULL) : 0; if (r >= 0) { |