]> git.alsa-project.org Git - alsa-lib.git/commit
ucm: Set default include path
authorTakashi Iwai <tiwai@suse.de>
Wed, 28 Nov 2018 15:25:41 +0000 (16:25 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 29 Nov 2018 08:40:10 +0000 (09:40 +0100)
commitc9fcf9836907b1ccda0c1f72b698ee5c5dd5199c
tree5aa42cdec6e453b5aef2b9de75a8d5d72716b75f
parentd48adc2a206d044678be09953d57971c0e1907c7
ucm: Set default include path

Many UCM profiles include the UCM profile components under ucm/*
subdirectories and thusly put <searchdir:ucm> at each place.  This is
rather cumbersome.

This patch makes the UCM parser to set the default include path, so
that each profile no longer needs to set searchdir.  All the
<searchdir:ucm> lines currently found in the profiles are removed
gracefully, too.

For the needed implementation, a new helper,
_snd_config_load_with_include() is introduced.  It's not exported,
only for the use inside alsa-lib.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
23 files changed:
include/local.h
src/conf.c
src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640/HiFi.conf
src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651/HiFi.conf
src/conf/ucm/chtnau8824/HiFi.conf
src/conf/ucm/chtrt5645/HiFi.conf
src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
src/ucm/parser.c
src/ucm/ucm_local.h
src/ucm/utils.c