Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alsa-ucm-conf for openSUSE:Factory checked in at 2023-09-06 18:55:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-ucm-conf (Old) and /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-ucm-conf" Wed Sep 6 18:55:56 2023 rev:28 rq:1108922 version:1.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-ucm-conf/alsa-ucm-conf.changes 2023-05-09 13:07:56.745238077 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.1766/alsa-ucm-conf.changes 2023-09-06 18:56:52.944754924 +0200 @@ -1,0 +2,12 @@ +Mon Sep 4 12:41:12 UTC 2023 - Takashi Iwai <[email protected]> + +- Update to version 1.2.10: + * updates / fixes for various devices: mtk-rt5650, usb-audio, tegra + es8316, sof-essx8336, pinephone, Steinberg UR44C, AMD ACP RPL, + ACP63, sof-hda-dsp, etc + For details, see: + https://www.alsa-project.org/wiki/Changes_v1.2.9_v1.2.10#alsa-ucm-conf +- Upstream regression fix: + 0001-SplitPCM-Device-argument-may-not-be-set.patch + +------------------------------------------------------------------- Old: ---- alsa-ucm-conf-1.2.9.tar.bz2 alsa-ucm-conf-1.2.9.tar.bz2.sig New: ---- 0001-SplitPCM-Device-argument-may-not-be-set.patch alsa-ucm-conf-1.2.10.tar.bz2 alsa-ucm-conf-1.2.10.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-ucm-conf.spec ++++++ --- /var/tmp/diff_new_pack.2jI0Z3/_old 2023-09-06 18:56:54.212800127 +0200 +++ /var/tmp/diff_new_pack.2jI0Z3/_new 2023-09-06 18:56:54.216800270 +0200 @@ -17,7 +17,7 @@ Name: alsa-ucm-conf -Version: 1.2.9 +Version: 1.2.10 Release: 0 Summary: ALSA UCM Profiles License: BSD-3-Clause @@ -26,6 +26,7 @@ Source1: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2.sig # from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt Source2: alsa-ucm-conf.keyring +Patch1: 0001-SplitPCM-Device-argument-may-not-be-set.patch BuildRequires: fdupes BuildArch: noarch Requires: libasound2 >= 1.2.6.1 ++++++ 0001-SplitPCM-Device-argument-may-not-be-set.patch ++++++ >From b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <[email protected]> Date: Mon, 4 Sep 2023 16:39:52 +0200 Subject: [PATCH] SplitPCM: Device argument may not be set Link: https://github.com/alsa-project/alsa-ucm-conf/issues/346 Fixes: 10967ea ("SplitPCM: Fix Device variable in SplitPCMDevice macro") Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/common/pcm/split.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucm2/common/pcm/split.conf b/ucm2/common/pcm/split.conf index 80f23e6c6658..9ed2f95612de 100644 --- a/ucm2/common/pcm/split.conf +++ b/ucm2/common/pcm/split.conf @@ -326,7 +326,7 @@ DefineMacro.SplitPCMDevice { If.0 { Condition { Type String - Empty "${var:__Device}" + Empty "${var:-__Device}" } True.Define.__Device "0" } -- 2.35.3 ++++++ alsa-ucm-conf-1.2.9.tar.bz2 -> alsa-ucm-conf-1.2.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Allwinner/A64/PinePhone/HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Allwinner/A64/PinePhone/HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Allwinner/A64/PinePhone/HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Allwinner/A64/PinePhone/HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -26,11 +26,13 @@ Comment "Internal Earpiece" EnableSequence [ + cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono" cset "name='Earpiece Playback Switch' on" ] DisableSequence [ cset "name='Earpiece Playback Switch' off" + cset "name='AIF1 DA0 Stereo Playback Route' Stereo" ] Value { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Allwinner/A64/PinePhone/VoiceCall.conf new/alsa-ucm-conf-1.2.10/ucm2/Allwinner/A64/PinePhone/VoiceCall.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Allwinner/A64/PinePhone/VoiceCall.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Allwinner/A64/PinePhone/VoiceCall.conf 2023-09-01 17:36:34.000000000 +0200 @@ -31,11 +31,13 @@ Comment "Internal Earpiece" EnableSequence [ + cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono" cset "name='Earpiece Playback Switch' on" ] DisableSequence [ cset "name='Earpiece Playback Switch' off" + cset "name='AIF1 DA0 Stereo Playback Route' Stereo" ] Value { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/HDA/HDA.conf new/alsa-ucm-conf-1.2.10/ucm2/HDA/HDA.conf --- old/alsa-ucm-conf-1.2.9/ucm2/HDA/HDA.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/HDA/HDA.conf 2023-09-01 17:36:34.000000000 +0200 @@ -3,7 +3,7 @@ Define.Use "" # a non-empty string to use UCM configuration for HDA devices Define.Done "" # a non-empty string to skip the end error -Define.AcpCardId "$${find-card:field=name,return=id,regex='^(acp|acp6x)$'}" +Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x])$'}" Define.DeviceMic "Mic" If.dualcodec { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-essx8336/HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-essx8336/HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-essx8336/HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-essx8336/HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -82,6 +82,7 @@ DisableSequence [ cset "name='Speaker Switch' off" ] + Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" @@ -99,6 +100,14 @@ "Speaker" ] + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] + Value { PlaybackPriority 300 PlaybackPCM "hw:${CardId}" @@ -123,12 +132,12 @@ } EnableSequence [ - cset "name='Headset Switch' on" + cset "name='Headset Mic Switch' on" cset "name='Digital Mic Mux' 'dmic disable'" ] DisableSequence [ - cset "name='Headset Switch' on" + cset "name='Headset Mic Switch' off" ] Value { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-essx8336/sof-essx8336.conf new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-essx8336/sof-essx8336.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-essx8336/sof-essx8336.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-essx8336/sof-essx8336.conf 2023-09-01 17:36:34.000000000 +0200 @@ -32,7 +32,7 @@ Haystack "${CardComponents}" Needle "cfg-dmics:" } - True.Define.DeviceDmic "Dmic" + True.Define.DeviceDmic "Mic" } SectionUseCase."HiFi" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-hda-dsp/HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-hda-dsp/HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-hda-dsp/HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-hda-dsp/HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -22,6 +22,7 @@ Value { CapturePriority 100 CapturePCM "hw:${CardId},6" + CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" If.chn { Condition { Type RegexMatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2023-09-01 17:36:34.000000000 +0200 @@ -3,6 +3,8 @@ Define.DeviceMic "Mic" Define.DeviceDmic "" +Include.card-init.File "/lib/card-init.conf" + If.devdmic { Condition { Type String @@ -19,6 +21,8 @@ # when all internal inputs are off # sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" + # dmic array info + exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" ] } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/MediaTek/mtk-rt5650/HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/MediaTek/mtk-rt5650/HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/MediaTek/mtk-rt5650/HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/MediaTek/mtk-rt5650/HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -45,7 +45,6 @@ PlaybackPriority 200 PlaybackMixerElem "Headphone" PlaybackVolume "Headphone Playback Volume" - JackControl "Headset Jack" JackHWMute "Speaker" } } @@ -79,7 +78,6 @@ CaptureMasterElem "ADC" CaptureMixerElem "IN" CaptureVolume "IN Capture Volume" - JackControl "Headset Jack" JackHWMute "Mic" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Qualcomm/sc8280xp/HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Qualcomm/sc8280xp/HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Qualcomm/sc8280xp/HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/Qualcomm/sc8280xp/HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -27,7 +27,7 @@ Value { PlaybackPriority 100 - PlaybackPCM "hw:${CardId},5" + PlaybackPCM "hw:${CardId},1" PlaybackMixer "default:${CardId}" } } @@ -42,7 +42,7 @@ Value { PlaybackPriority 200 - PlaybackPCM "hw:${CardId},4" + PlaybackPCM "hw:${CardId},0" PlaybackMixer "default:${CardId}" PlaybackMixerElem "HP Digital" JackControl "Headphone Jack" @@ -60,7 +60,7 @@ Value { CapturePriority 100 - CapturePCM "hw:${CardId},6" + CapturePCM "hw:${CardId},2" CaptureMixerElem "ADC2" JackControl "Mic Jack" JackHWMute "DMic01" @@ -78,6 +78,6 @@ Value { CapturePriority 100 - CapturePCM "hw:${CardId},7" + CapturePCM "hw:${CardId},3" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Rockchip/rk3588-es8316/HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Rockchip/rk3588-es8316/HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Rockchip/rk3588-es8316/HiFi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Rockchip/rk3588-es8316/HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,42 @@ +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='Playback Polarity' 'Normal'" + ] + + DisableSequence [ + cset "name='Playback Polarity' 'R Invert'" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" + JackControl "Headphones Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone on IN2" + + EnableSequence [ + cset "name='Differential Mux' lin2-rin2" + cset "name='Left Headphone Mux' lin2-rin2" + cset "name='Right Headphone Mux' lin2-rin2" + ] + + DisableSequence [ + cset "name='Differential Mux' lin1-rin1" + cset "name='Left Headphone Mux' lin1-rin1" + cset "name='Right Headphone Mux' lin1-rin1" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Rockchip/rk3588-es8316/rk3588-es8316.conf new/alsa-ucm-conf-1.2.10/ucm2/Rockchip/rk3588-es8316/rk3588-es8316.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Rockchip/rk3588-es8316/rk3588-es8316.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Rockchip/rk3588-es8316/rk3588-es8316.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,26 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Rockchip/rk3588-es8316/HiFi.conf" + Comment "Play HiFi quality Music" +} + +BootSequence [ + # Set HP vol to 0 dB (3/3) + cset "name='Headphone Playback Volume' 3" + # Set HP mixer vol to 0 dB + cset "name='Headphone Mixer Volume' 11" + # Set DAC vol to 0 dB (192/192) + cset "name='DAC Playback Volume' 192" + + # Disable Auto Level Control + cset "name='ALC Capture Switch' off" + # Set ADC vol to 0 dB (192/192) + cset "name='ADC Capture Volume' 192" + # Set Mic amplifier to +16 dB + cset "name='ADC PGA Gain Volume' 7" + + # Setup muxes / switches + cset "name='Left Headphone Mixer Left DAC Switch' on" + cset "name='Right Headphone Mixer Right DAC Switch' on" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/max98089/lge-x3-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/max98089/lge-x3-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/max98089/lge-x3-HiFi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/max98089/lge-x3-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,148 @@ +# Use case Configuration for MAX98089 on LG Optimus 4X HD/Vu P880/P895 + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speaker Switch' on" + cset "name='Int Spk Switch' on" + + cset "name='Left SPK Mixer Left DAC1 Switch' on" + cset "name='Left SPK Mixer Left DAC2 Switch' on" + cset "name='Left SPK Mixer Right DAC1 Switch' on" + cset "name='Left SPK Mixer Right DAC2 Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + cset "name='Int Spk Switch' off" + + cset "name='Left SPK Mixer Left DAC1 Switch' off" + cset "name='Left SPK Mixer Left DAC2 Switch' off" + cset "name='Left SPK Mixer Right DAC1 Switch' off" + cset "name='Left SPK Mixer Right DAC2 Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 300 + + PlaybackMixerElem "Speaker" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Headphone Switch' on" + + cset "name='Left HP Mixer Left DAC1 Switch' on" + cset "name='Left HP Mixer Left DAC2 Switch' on" + cset "name='Right HP Mixer Right DAC1 Switch' on" + cset "name='Right HP Mixer Right DAC2 Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + + cset "name='Left HP Mixer Left DAC1 Switch' off" + cset "name='Left HP Mixer Left DAC2 Switch' off" + cset "name='Right HP Mixer Right DAC1 Switch' off" + cset "name='Right HP Mixer Right DAC2 Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 100 + + PlaybackMixerElem "Headphone" + + JackControl "Headphone Jack" + } +} + +SectionDevice."Mic1" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Mic2" + ] + + EnableSequence [ + # Main MIC + cset "name='Internal Mic 1 Switch' on" + cset "name='DAI1 ADC Filter' fc=258/fs=16k" + + cset "name='Left ADC Mixer MIC1 Switch' on" + cset "name='Right ADC Mixer MIC1 Switch' on" + + # Secondary MIC + cset "name='Int Mic Switch' on" + cset "name='Internal Mic 2 Switch' on" + + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='Right ADC Mixer MIC2 Switch' on" + ] + + DisableSequence [ + # Main MIC + cset "name='Internal Mic 1 Switch' off" + cset "name='DAI1 ADC Filter' off" + + cset "name='Left ADC Mixer MIC1 Switch' off" + cset "name='Right ADC Mixer MIC1 Switch' off" + + # Secondary MIC + cset "name='Int Mic Switch' off" + cset "name='Internal Mic 2 Switch' off" + + cset "name='Left ADC Mixer MIC2 Switch' off" + cset "name='Right ADC Mixer MIC2 Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CaptureChannels 2 + CapturePriority 200 + } +} + +SectionDevice."Mic2" { + Comment "External Microphone" + + ConflictingDevice [ + "Mic1" + ] + + EnableSequence [ + cset "name='Mic Jack Switch' on" + + cset "name='Left ADC Mixer INA1 Switch' on" + cset "name='Right ADC Mixer INA1 Switch' on" + ] + + DisableSequence [ + cset "name='Mic Jack Switch' off" + + cset "name='Left ADC Mixer INA1 Switch' off" + cset "name='Right ADC Mixer INA1 Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 100 + + JackControl "Mic Jack" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,125 @@ +# Use case Configuration for MAX98089 on LG Optimus 4X HD/Vu P880/P895 + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Earpiece" + ] + + EnableSequence [ + cset "name='Speaker Switch' on" + cset "name='Int Spk Switch' on" + + cset "name='Left SPK Mixer Left DAC1 Switch' on" + cset "name='Left SPK Mixer Left DAC2 Switch' on" + cset "name='Left SPK Mixer Right DAC1 Switch' on" + cset "name='Left SPK Mixer Right DAC2 Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + cset "name='Int Spk Switch' off" + + cset "name='Left SPK Mixer Left DAC1 Switch' off" + cset "name='Left SPK Mixer Left DAC2 Switch' off" + cset "name='Left SPK Mixer Right DAC1 Switch' off" + cset "name='Left SPK Mixer Right DAC2 Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 100 + + PlaybackMixerElem "Speaker" + } +} + +SectionDevice."Earpiece" { + Comment "Earpiece" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Receiver Switch' on" + cset "name='Earpiece Switch' on" + + cset "name='Left REC Mixer Left DAC1 Switch' on" + cset "name='Left REC Mixer Left DAC2 Switch' on" + cset "name='Left REC Mixer Right DAC1 Switch' on" + cset "name='Left REC Mixer Right DAC2 Switch' on" + + cset "name='Right REC Mixer Left DAC1 Switch' on" + cset "name='Right REC Mixer Left DAC2 Switch' on" + cset "name='Right REC Mixer Right DAC1 Switch' on" + cset "name='Right REC Mixer Right DAC2 Switch' on" + ] + + DisableSequence [ + cset "name='Receiver Switch' off" + cset "name='Earpiece Switch' off" + + cset "name='Left REC Mixer Left DAC1 Switch' off" + cset "name='Left REC Mixer Left DAC2 Switch' off" + cset "name='Left REC Mixer Right DAC1 Switch' off" + cset "name='Left REC Mixer Right DAC2 Switch' off" + + cset "name='Right REC Mixer Left DAC1 Switch' off" + cset "name='Right REC Mixer Left DAC2 Switch' off" + cset "name='Right REC Mixer Right DAC1 Switch' off" + cset "name='Right REC Mixer Right DAC2 Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 200 + + PlaybackMixerElem "Receiver" + } +} + +SectionDevice."Mic1" { + Comment "Internal Microphone" + + EnableSequence [ + # Main MIC + cset "name='Internal Mic 1 Switch' on" + cset "name='DAI1 ADC Filter' fc=258/fs=16k" + + cset "name='Left ADC Mixer MIC1 Switch' on" + cset "name='Right ADC Mixer MIC1 Switch' on" + + # Secondary MIC + cset "name='Int Mic Switch' on" + cset "name='Internal Mic 2 Switch' on" + + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='Right ADC Mixer MIC2 Switch' on" + ] + + DisableSequence [ + # Main MIC + cset "name='Internal Mic 1 Switch' off" + cset "name='DAI1 ADC Filter' off" + + cset "name='Left ADC Mixer MIC1 Switch' off" + cset "name='Right ADC Mixer MIC1 Switch' off" + + # Secondary MIC + cset "name='Int Mic Switch' off" + cset "name='Internal Mic 2 Switch' off" + + cset "name='Left ADC Mixer MIC2 Switch' off" + cset "name='Right ADC Mixer MIC2 Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CaptureChannels 2 + CapturePriority 200 + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/max98089/lge-x3.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/max98089/lge-x3.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/max98089/lge-x3.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/max98089/lge-x3.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,47 @@ +# Use case Configuration for MAX98089 on LG Optimus 4X HD/Vu P880/P895 + +Syntax 4 + +BootSequence [ + cset "name='MIC1 Volume' 10" + cset "name='MIC1 Boost Volume' 1" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 1" + + cset "name='INA Volume' 5" + cset "name='INB Volume' 5" + + cset "name='ADCL Volume' 15" + cset "name='ADCR Volume' 15" + + cset "name='DAI1 Filter Mode' Music" + + cset "name='EQ1 Switch' off" + cset "name='EQ2 Switch' off" + + cset "name='Speaker Switch' off" + cset "name='Int Spk Switch' off" + cset "name='Headphone Switch' off" + cset "name='Earpiece Switch' off" + cset "name='Receiver Switch' off" + + cset "name='Int Mic Switch' off" + cset "name='Internal Mic 1 Switch' off" + cset "name='Internal Mic 2 Switch' off" + cset "name='Mic Jack Switch' off" + + cset "name='Right SPK Mixer Left DAC1 Switch' on" + cset "name='Right SPK Mixer Left DAC2 Switch' on" + cset "name='Right SPK Mixer Right DAC1 Switch' on" + cset "name='Right SPK Mixer Right DAC2 Switch' on" +] + +SectionUseCase."HiFi" { + File "/Tegra/max98089/lge-x3-HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."Voice Call" { + File "/Tegra/max98089/lge-x3-VoiceCall.conf" + Comment "Make a phone call" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/rt5631/Asus-Transformer-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/rt5631/Asus-Transformer-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/rt5631/Asus-Transformer-HiFi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/rt5631/Asus-Transformer-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,101 @@ +# Use case Configuration for RT5631 based ASUS Transformers + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + ] + + DisableSequence [ + cset "name='Int Spk Switch' off" + cset "name='Speaker Playback Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 200 + + PlaybackMixerElem "Speaker" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='HP Playback Switch' on" + ] + + DisableSequence [ + cset "name='HP Playback Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 100 + + PlaybackMixerElem "HP" + + JackControl "Headphone Jack" + } +} + +SectionDevice."Mic1" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Mic2" + ] + + EnableSequence [ + cset "name='DMIC Capture Switch' on" + cset "name='DMIC Switch' on" + cset "name='Int Mic Switch' on" + ] + + DisableSequence [ + cset "name='DMIC Capture Switch' off" + cset "name='DMIC Switch' off" + cset "name='Int Mic Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 200 + } +} + +SectionDevice."Mic2" { + Comment "External Microphone" + + ConflictingDevice [ + "Mic1" + ] + + EnableSequence [ + cset "name='Mic Jack Switch' on" + ] + + DisableSequence [ + cset "name='Mic Jack Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 100 + + JackControl "Mic Jack" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/rt5631/Asus-Transformer.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/rt5631/Asus-Transformer.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/rt5631/Asus-Transformer.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/rt5631/Asus-Transformer.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,65 @@ +# Use case Configuration for RT5631 based ASUS Transformers + +Syntax 4 + +BootSequence [ + cset "name='HP Playback Switch' off" + cset "name='Speaker Playback Switch' off" + + cset "name='PCM Playback Switch' on" + cset "name='PCM Playback Volume' 255" + cset "name='AXI Capture Volume' 23" + + cset "name='AXO2 Playback Switch' on" + cset "name='AXO2MIX Mixer OUTVOLL Playback Switch' on" + + cset "name='DMIC Switch' off" + cset "name='DMIC Capture Switch' off" + + cset "name='HPL Mux' Left HPVOL" + cset "name='HPR Mux' Right HPVOL" + + cset "name='Mic Jack Switch' off" + cset "name='Int Mic Switch' off" + cset "name='Int Spk Switch' on" + + cset "name='Left HPVOL Mux' OUTMIXL" + cset "name='Left OUTVOL Mux' OUTMIXL" + cset "name='Left SPKVOL Mux' SPKMIXL" + + cset "name='MIC1 Boost Volume' 6" + cset "name='MIC1 Mode Control' Differential" + cset "name='MIC2 Boost Volume' 6" + cset "name='MIC2 Mode Control' Single ended" + + cset "name='MONO Playback Switch' off" + cset "name='MONO Mux' MONOMIX" + cset "name='MONOIN Mode Control' Differential" + cset "name='MONOIN_RX Capture Volume' 25" + + cset "name='OUTMIXL Mixer DACL Playback Switch' on" + cset "name='OUTMIXR Mixer DACR Playback Switch' on" + + cset "name='OUTVOL Channel Switch' on" + cset "name='RECMIXL Mixer MIC1_BST1 Capture Switch' on" + + cset "name='Right HPVOL Mux' OUTMIXR" + cset "name='Right OUTVOL Mux' OUTMIXR" + cset "name='Right SPKVOL Mux' SPKMIXR" + + cset "name='SPK Ratio Control' 1.99x" + + cset "name='SPKMIXL Mixer DACL Playback Switch' on" + cset "name='SPKMIXR Mixer DACR Playback Switch' on" + + cset "name='SPOL Mux' SPOLMIX" + cset "name='SPOLMIX Mixer SPKVOLL Playback Switch' on" + + cset "name='SPOR Mux' SPORMIX" + cset "name='SPORMIX Mixer SPKVOLR Playback Switch' on" +] + +SectionUseCase."HiFi" { + File "/Tegra/rt5631/Asus-Transformer-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/wm8903/Asus-Transformer-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/wm8903/Asus-Transformer-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/wm8903/Asus-Transformer-HiFi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/wm8903/Asus-Transformer-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,108 @@ +# Use case Configuration for WM8903 based ASUS Transformers + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speaker Switch' on" + cset "name='Int Spk Switch' on" + ] + + DisableSequence [ + cset "name='Int Spk Switch' off" + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 200 + + PlaybackMixerElem "Speaker" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 + PlaybackPriority 100 + + PlaybackMixerElem "Headphone" + + JackControl "Headphone Jack" + } +} + +SectionDevice."Mic1" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Mic2" + ] + + EnableSequence [ + cset "name='Int Mic Switch' on" + cset "name='ADC Input' DMIC" + ] + + DisableSequence [ + cset "name='Int Mic Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 200 + } +} + +SectionDevice."Mic2" { + Comment "External Microphone" + + ConflictingDevice [ + "Mic1" + ] + + EnableSequence [ + cset "name='Mic Jack Switch' on" + cset "name='ADC Input' ADC" + + cset "name='Left Capture Mux' Left" + + cset "name='Left Input Mux' IN1L" + cset "name='Left Input Inverting Mux' IN2L" + cset "name='Left Input Mode Mux' Differential Mic" + + cset "name='Left Input PGA Switch' on" + ] + + DisableSequence [ + cset "name='Mic Jack Switch' off" + cset "name='Left Input PGA Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 100 + + JackControl "Mic Jack" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/Tegra/wm8903/Asus-Transformer.conf new/alsa-ucm-conf-1.2.10/ucm2/Tegra/wm8903/Asus-Transformer.conf --- old/alsa-ucm-conf-1.2.9/ucm2/Tegra/wm8903/Asus-Transformer.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/Tegra/wm8903/Asus-Transformer.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,37 @@ +# Use case Configuration for WM8903 based ASUS Transformers + +Syntax 4 + +BootSequence [ + cset "name='HPF Switch' on" + cset "name='HPF Mode' Voice 1" + + cset "name='DRC Switch' on" + cset "name='Digital Capture Volume' 127" + + cset "name='Headphone Switch' off" + cset "name='Headphone ZC Switch' off" + cset "name='Headphone Volume' 45" + + cset "name='Line Out Switch' on" + cset "name='Line Out ZC Switch' off" + cset "name='Line Out Volume' 57" + + cset "name='Speaker Switch' off" + cset "name='Speaker ZC Switch' off" + cset "name='Speaker Volume' 60" + + cset "name='Int Spk Switch' on" + cset "name='Int Mic Switch' off" + cset "name='Mic Jack Switch' off" + + cset "name='ADC Input' DMIC" + + cset "name='Left Speaker Mixer DACL Switch' on" + cset "name='Right Speaker Mixer DACR Switch' on" +] + +SectionUseCase."HiFi" { + File "/Tegra/wm8903/Asus-Transformer-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Arturia/Minifuse-12-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Arturia/Minifuse-12-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Arturia/Minifuse-12-HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Arturia/Minifuse-12-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -23,6 +23,7 @@ SplitPCM { Name "minifuse12_stereo_out" Direction Playback + Format S32_LE Channels 2 HWChannels 4 HWChannelPos0 FL @@ -35,6 +36,7 @@ SplitPCM { Name "minifuse12_stereo_in" Direction Capture + Format S32_LE Channels 2 HWChannels 4 HWChannelPos0 FL @@ -47,6 +49,7 @@ SplitPCM { Name "minifuse12_mono_in" Direction Capture + Format S32_LE Channels 1 HWChannels 4 HWChannelPos0 MONO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -3,19 +3,6 @@ Macro [ { SplitPCM { - Name "scarlett2i_stereo_out" - Direction Playback - Format S32_LE - Channels 2 - HWChannels 4 - HWChannelPos0 FL - HWChannelPos1 FR - HWChannelPos2 FL - HWChannelPos3 FR - } - } - { - SplitPCM { Name "scarlett2i_mono_in" Direction Capture Format S32_LE @@ -27,31 +14,65 @@ } ] +If.2i4 { + Condition { + Type String + String1 "${var:PlaybackChannels}" + String2 "4" + } + True.Macro [ + { + SplitPCM { + Name "scarlett2i_stereo_out" + Direction Playback + Format S32_LE + Channels 2 + HWChannels 4 + HWChannelPos0 FL + HWChannelPos1 FR + HWChannelPos2 FL + HWChannelPos3 FR + } + } + ] +} + SectionDevice."Line1" { - Comment "Line 1-2" + Comment "${var:Playback1Name}" + Value { PlaybackPriority 200 } - Macro.pcm_split.SplitPCMDevice { - Name "scarlett2i_stereo_out" - Direction Playback - HWChannels 4 - Channels 2 - Channel0 0 - Channel1 1 - ChannelPos0 FL - ChannelPos1 FR + If.2i4 { + Condition { + Type String + String1 "${var:PlaybackChannels}" + String2 "4" + } + True.Macro.pcm_split.SplitPCMDevice { + Name "scarlett2i_stereo_out" + Direction Playback + HWChannels 4 + Channels 2 + Channel0 0 + Channel1 1 + ChannelPos0 FL + ChannelPos1 FR + } + False.Value { + PlaybackPCM "hw:${CardId}" + } } } -If.scarlett_2i4 { +If.2i4 { Condition { Type String String1 "${var:PlaybackChannels}" String2 "4" } True.SectionDevice."Line2" { - Comment "Line 3-4" + Comment "${var:Playback2Name}" Value { PlaybackPriority 100 @@ -70,7 +91,7 @@ } SectionDevice."Mic1" { - Comment "Input 1" + Comment "${var:Capture1Name}" Value { CapturePriority 200 @@ -86,7 +107,7 @@ } SectionDevice."Mic2" { - Comment "Input 2" + Comment "${var:Capture2Name}" Value { CapturePriority 100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf 2023-09-01 17:36:34.000000000 +0200 @@ -1,34 +1,61 @@ -Define.PlaybackChannels 4 -Define.DirectPlaybackChannels 4 -Define.DirectCaptureChannels 2 -Define.Generation 2 +Define { + PlaybackChannels 2 + DirectPlaybackChannels 2 + DirectCaptureChannels 2 + Model "2i2" + Playback1Name "Headphones / Line 1-2" + Playback2Name "Line 3-4" + Capture1Name "Input 1 Mic/Inst/Line" + Capture2Name "Input 2 Mic/Inst/Line" + Generation "1st" +} -If.scarlett_2i2 { +If.solo { Condition { - Type String - Haystack "${CardComponents}" - Needle "USB1235:8202" + Type RegexMatch + String "${CardComponents}" + Regex "USB1235:8(01c|2(05|11))" } True.Define { - PlaybackChannels 2 - DirectPlaybackChannels 2 + Model "Solo" + Capture1Name "Input 1 Mic" + Capture2Name "Input 2 Inst/Line" } } -If.scarlett_2i2_gen3 { +If.2i4 { Condition { - Type String - Haystack "${CardComponents}" - Needle "USB1235:8210" + Type RegexMatch + String "${CardComponents}" + Regex "USB1235:8(00a|200)" } True.Define { - PlaybackChannels 2 - DirectPlaybackChannels 2 - Generation 3 + PlaybackChannels 4 + DirectPlaybackChannels 4 + Model "2i4" + Playback1Name "Line 1-2" + } +} + +If.gen2 { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB1235:820[025]" + } + True.Define.Generation "2nd" +} + +If.gen3 { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB1235:821[01]" } + True.Define.Generation "3rd" } -Comment "Focusrite Scarlett 2i${var:PlaybackChannels} Gen ${var:Generation}" +Comment "Focusrite Scarlett ${var:Model} ${var:Generation} Gen" SectionUseCase."HiFi" { Comment "Default" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -102,6 +102,23 @@ } } +If.asrock-taichi { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB(26ce:0a0[68])" + } + True.Define { + Line1Name "" + Mic1Name "Rear Input" + Mic1PCM "hw:${CardId},0" + Mic2Name "Front Microphone" + Mic2Mixer "Mic" + Mic2Jack "Front Mic - Input Jack" + Mic2PCM "hw:${CardId},1" + } +} + If.wrx80-sage { Condition { Type RegexMatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/USB-Audio.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/USB-Audio.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/USB-Audio.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/USB-Audio.conf 2023-09-01 17:36:34.000000000 +0200 @@ -55,8 +55,9 @@ # 0b05:1a16 ASUS ROG Strix B660-F Gaming WiFi # 0b05:1a20 ASUS ROG STRIX Z690-I Gaming Wifi # 0b05:1a27 ALC4082 on ASUS ROG Maximus Z690 Hero - # 0b05:1a52 ASUS ROG Strix Z790-E Gaming Wifi + # 0b05:1a52 ASUS ROG Strix X670E-F & Z790-E Gaming Wifi # 0b05:1a53 ALC4082 on ASUS ROG Crosshair X670E Extreme + # 0b05:1a5c ASUS ROG Strix B650E-I Gaming WiFi # 0db0:005a MSI MPG Z690 CARBON WIFI # 0db0:151f MSI X570S EDGE MAX WIFI # 0db0:1feb MSI Edge Wifi Z690 @@ -78,7 +79,9 @@ # 0db0:b202 MSI MAG Z690 Tomahawk Wifi # 0db0:d1d7 MSI PRO Z790-A WIFI # 0db0:d6e7 MSI MPG X670E Carbon Wifi - Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23])))|(0db0:(005a|151f|1feb|3130|36e7|419c|422d|4240|62a4|6c[0c]9|7696|82c7|8af7|961e|a073|a47c|a74b|b202|d1d7|d6e7)))" + # 26ce:0a06 ASRock X670E/Z790 Taichi + # 26ce:0a08 ASRock Z790 PG-ITX/TB4 + Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c])))|(0db0:(005a|151f|1feb|3130|36e7|419c|422d|4240|62a4|6c[0c]9|7696|82c7|8af7|961e|a073|a47c|a74b|b202|d1d7|d6e7))|(26ce:0a0[68]))" } True.Define.ProfileName "Realtek/ALC4080" } @@ -103,9 +106,9 @@ If.steinberg-ur44 { Condition { - Type String - Haystack "${CardComponents}" - Needle "USB0499:1700" + Type RegexMatch + String "${CardComponents}" + Regex "USB0499:17[03]0" } True.Define.ProfileName "Steinberg/UR44" } @@ -194,7 +197,15 @@ Condition { Type RegexMatch String "${CardComponents}" - Regex "USB1235:82(0[02]|10)" + # 8006 2i2 1st Gen + # 800a 2i4 1st Gen + # 801c Solo 1st Gen + # 8200 2i4 2nd Gen + # 8202 2i2 2nd Gen + # 8205 Solo 2nd Gen + # 8210 2i2 3rd Gen + # 8211 Solo 3rd Gen + Regex "USB1235:8(0(0[6a]|1c)|2(0[025]|1[01]))" } True.Define { ProfileName "Focusrite/Scarlett-2i" @@ -315,6 +326,17 @@ True.Define.ProfileName "Audient/Audient-iD4-0009" } +If.ua-volt2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB2b5a:0021" + } + True.Define { + ProfileName "UniversalAudio/Volt2" + } +} + If.mixremap { Condition { Type String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/UniversalAudio/Volt2-HiFi.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/UniversalAudio/Volt2-HiFi.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/UniversalAudio/Volt2-HiFi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/UniversalAudio/Volt2-HiFi.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,54 @@ +Include.pcm_split.File "/common/pcm/split.conf" + +Macro [ + { + SplitPCM { + Name "volt2_mono_in" + Direction Capture + Channels 1 + HWChannels 2 + HWChannelPos0 MONO + HWChannelPos1 MONO + } + } +] + +SectionDevice."Line1" { + Comment "Monitor Out" + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Mic1" { + Comment "Mono Input 1" + + Value { + CapturePriority 200 + } + Macro.pcm_split.SplitPCMDevice { + Name "volt2_mono_in" + Direction Capture + HWChannels 2 + Channels 1 + Channel0 0 + ChannelPos0 MONO + } +} + +SectionDevice."Mic2" { + Comment "Mono Input 2" + + Value { + CapturePriority 100 + } + Macro.pcm_split.SplitPCMDevice { + Name "volt2_mono_in" + Direction Capture + HWChannels 2 + Channels 1 + Channel0 1 + ChannelPos0 MONO + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/UniversalAudio/Volt2.conf new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/UniversalAudio/Volt2.conf --- old/alsa-ucm-conf-1.2.9/ucm2/USB-Audio/UniversalAudio/Volt2.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/USB-Audio/UniversalAudio/Volt2.conf 2023-09-01 17:36:34.000000000 +0200 @@ -0,0 +1,11 @@ +Comment "Universal Audio Volt 2" + +SectionUseCase."HiFi" { + Comment "Default" + File "/USB-Audio/UniversalAudio/Volt2-HiFi.conf" +} + +Define.DirectPlaybackChannels 2 +Define.DirectCaptureChannels 2 + +Include.dhw.File "/common/direct.conf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/common/pcm/split.conf new/alsa-ucm-conf-1.2.10/ucm2/common/pcm/split.conf --- old/alsa-ucm-conf-1.2.9/ucm2/common/pcm/split.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/common/pcm/split.conf 2023-09-01 17:36:34.000000000 +0200 @@ -323,13 +323,12 @@ # DefineMacro.SplitPCMDevice { - Define.__dev "" If.0 { Condition { Type String - Empty "${var:__dev}" + Empty "${var:__Device}" } - True.Define.__dev "0" + True.Define.__Device "0" } If.1 { Condition { @@ -339,7 +338,7 @@ False { Value { "${var:__Direction}Channels" "${var:__HWChannels}" - "${var:__Direction}PCM" "hw:${CardId},${var:__dev}" + "${var:__Direction}PCM" "hw:${CardId},${var:__Device}" "${var:__Direction}Channel0" "${var:__Channel0}" "${var:__Direction}ChannelPos0" "${var:__ChannelPos0}" } @@ -355,7 +354,7 @@ } } True { - Define.__pcmdev "${var:__Name}:${CardId},${var:__dev},${var:__Channel0}" + Define.__pcmdev "${var:__Name}:${CardId},${var:__Device},${var:__Channel0}" If.ch1 { Condition { Type String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/conf.d/acp62/acp62.conf new/alsa-ucm-conf-1.2.10/ucm2/conf.d/acp62/acp62.conf --- old/alsa-ucm-conf-1.2.9/ucm2/conf.d/acp62/acp62.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/conf.d/acp62/acp62.conf 2023-09-06 18:56:55.120832497 +0200 @@ -0,0 +1 @@ +symbolic link to ../../common/linked-card.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/conf.d/acp63/acp63.conf new/alsa-ucm-conf-1.2.10/ucm2/conf.d/acp63/acp63.conf --- old/alsa-ucm-conf-1.2.9/ucm2/conf.d/acp63/acp63.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/conf.d/acp63/acp63.conf 2023-09-06 18:56:55.132832925 +0200 @@ -0,0 +1 @@ +symbolic link to ../../common/linked-card.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/conf.d/rk3588-es8316/rk3588-es8316.conf new/alsa-ucm-conf-1.2.10/ucm2/conf.d/rk3588-es8316/rk3588-es8316.conf --- old/alsa-ucm-conf-1.2.9/ucm2/conf.d/rk3588-es8316/rk3588-es8316.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.10/ucm2/conf.d/rk3588-es8316/rk3588-es8316.conf 2023-09-06 18:56:55.140833210 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Rockchip/rk3588-es8316/rk3588-es8316.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus EeePad Slider WM8903.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus EeePad Slider WM8903.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus EeePad Slider WM8903.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus EeePad Slider WM8903.conf" 2023-09-06 18:56:55.028829217 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/wm8903/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus EeePad Transformer WM8903.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus EeePad Transformer WM8903.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus EeePad Transformer WM8903.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus EeePad Transformer WM8903.conf" 2023-09-06 18:56:55.008828504 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/wm8903/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Infinity TF700T RT5631.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Infinity TF700T RT5631.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Infinity TF700T RT5631.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Infinity TF700T RT5631.conf" 2023-09-06 18:56:55.024829075 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/rt5631/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Pad TF300T WM8903.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Pad TF300T WM8903.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Pad TF300T WM8903.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Pad TF300T WM8903.conf" 2023-09-06 18:56:54.984827649 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/wm8903/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Pad TF300TG RT5631.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Pad TF300TG RT5631.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Pad TF300TG RT5631.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Pad TF300TG RT5631.conf" 2023-09-06 18:56:55.000828219 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/rt5631/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Pad TF300TL RT5631.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Pad TF300TL RT5631.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Pad TF300TL RT5631.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Pad TF300TL RT5631.conf" 2023-09-06 18:56:54.956826650 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/rt5631/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Prime TF201 RT5631.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Prime TF201 RT5631.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/Asus Transformer Prime TF201 RT5631.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/Asus Transformer Prime TF201 RT5631.conf" 2023-09-06 18:56:55.012828647 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/rt5631/Asus-Transformer.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/LG Optimus 4X HD MAX98089.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/LG Optimus 4X HD MAX98089.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/LG Optimus 4X HD MAX98089.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/LG Optimus 4X HD MAX98089.conf" 2023-09-06 18:56:54.952826508 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/max98089/lge-x3.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/LG Optimus Vu MAX98089.conf" "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/LG Optimus Vu MAX98089.conf" --- "old/alsa-ucm-conf-1.2.9/ucm2/conf.d/tegra/LG Optimus Vu MAX98089.conf" 1970-01-01 01:00:00.000000000 +0100 +++ "new/alsa-ucm-conf-1.2.10/ucm2/conf.d/tegra/LG Optimus Vu MAX98089.conf" 2023-09-06 18:56:54.988827791 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Tegra/max98089/lge-x3.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/dmic.conf new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/dmic.conf --- old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/dmic.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/dmic.conf 2023-09-01 17:36:34.000000000 +0200 @@ -17,5 +17,6 @@ CaptureMixerElem "Dmic0" CaptureVolume "Dmic0 Capture Volume" CaptureSwitch "Dmic0 Capture Switch" + CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/rt715-sdca.conf new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/rt715-sdca.conf --- old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/rt715-sdca.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/rt715-sdca.conf 2023-09-01 17:36:34.000000000 +0200 @@ -12,10 +12,11 @@ ] Value { - CapturePriority 100 - CapturePCM "hw:${CardId},4" - CaptureSwitch "rt714 FU02 Capture Switch" - CaptureVolume "rt714 FU02 Capture Volume" - CaptureMixerElem "rt714 FU02" + CapturePriority 100 + CapturePCM "hw:${CardId},4" + CaptureSwitch "rt714 FU02 Capture Switch" + CaptureVolume "rt714 FU02 Capture Volume" + CaptureMixerElem "rt714 FU02" + CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/rt715.conf new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/rt715.conf --- old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/rt715.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/rt715.conf 2023-09-01 17:36:34.000000000 +0200 @@ -26,5 +26,6 @@ CaptureSwitch "${var:rt715ctl} Switch" CaptureVolume "${var:rt715ctl} Volume" CaptureMixerElem "${var:rt715ctl}" + CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/sof-soundwire.conf new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/sof-soundwire.conf --- old/alsa-ucm-conf-1.2.9/ucm2/sof-soundwire/sof-soundwire.conf 2023-05-04 09:16:19.000000000 +0200 +++ new/alsa-ucm-conf-1.2.10/ucm2/sof-soundwire/sof-soundwire.conf 2023-09-01 17:36:34.000000000 +0200 @@ -92,3 +92,14 @@ cset "name='PGA5.0 5 Master Capture Switch' 1" ] } + +If.mics-array { + Condition { + Type String + Empty "${var:Mics1}" + } + False.FixedBootSequence { + # dmic array info + exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" + } +}
