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>
This commit is contained in:
Takashi Iwai 2018-11-28 16:25:41 +01:00
parent d48adc2a20
commit c9fcf98369
23 changed files with 41 additions and 25 deletions

View file

@ -1,4 +1,3 @@
<searchdir:ucm>
SectionVerb {

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,6 +1,5 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
<searchdir:ucm>
SectionVerb {
EnableSequence [

View file

@ -1,4 +1,3 @@
<searchdir:ucm>
SectionVerb {

View file

@ -1,4 +1,3 @@
<searchdir:ucm>
SectionVerb {
# ALSA PCM

View file

@ -1,4 +1,3 @@
<searchdir:ucm>
SectionVerb {