From 703443deadb3a917de6af75b0fa2668e49c6ef47 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 23 Apr 2021 10:58:35 +0200 Subject: [PATCH] ucm2: add conf.virt.d lookup Signed-off-by: Jaroslav Kysela --- ucm2/README.md | 12 ++++++++++-- ucm2/ucm.conf | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ucm2/README.md b/ucm2/README.md index 3f07548..8ecdc89 100644 --- 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 8577c30..584c8c5 100644 --- 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" -- 2.47.1