ucm2: add conf.virt.d lookup

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/README.md b/ucm2/README.md
index 3f07548a8aef614e5dd35351cdf0efa4e2cd5ffc..8ecdc8954b22486e0ac551772fcee799149f18c8 100644 (file)
--- a/ucm2/README.md
+++ b/ucm2/README.md
@@ -13,13 +13,21 @@ configurations. They contain files included from other UCMs.
 UCM master configuration path lookup is defined in the top level
 ucm.conf file. This file allows custom directory layout. The new
 ucm2 layout is based on the kernel module driver name with the
-ALSA driver name fallback.
+ALSA driver name fallback. The virtual cards (no direct hw bound)
+lookups are placed to the separate conf.virt.d directory.
 
 The lookup configuration:
 
   https://git.alsa-project.org/?p=alsa-ucm-conf.git;a=blob;f=ucm2/ucm.conf
 
-Example paths:
+Example paths - new conf.d scheme:
+
+- conf.d/USB-Audio/Dell-WD15-Dock.conf
+-- special configuration for the Dell docking station with USB soundcard
+- conf.virt.d/TwoCardsMix.conf
+-- virtual UCM from two soundcards
+
+Example paths - no conf.d scheme (may be invalidated):
 
 - USB-Audio/Dell-WD15-Dock.conf
 -- special configuration for the Dell docking station with USB soundcard

diff --git a/ucm2/ucm.conf b/ucm2/ucm.conf
index 8577c300e46b9f1190cebb245745f18df5ecf76f..584c8c5ffaae7ddbf4984b98223cf71c9c615adc 100644 (file)
--- a/ucm2/ucm.conf
+++ b/ucm2/ucm.conf
@@ -27,9 +27,14 @@ If.driver {
                #
                # The probed path for no-hw-card:
                #
+               #   ucm2/conf.virt.d/${OpenName}.conf
                #   ucm2/${OpenName}/${OpenName}.conf
                #
                UseCasePath {
+                       virt {
+                               Directory "conf.virt.d"
+                               File "${OpenName}.conf"
+                       }
                        legacy {
                                Directory "${OpenName}"
                                File "${OpenName}.conf"