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 2022-07-21 11:32:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-ucm-conf (Old) and /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-ucm-conf" Thu Jul 21 11:32:56 2022 rev:25 rq:989802 version:1.2.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-ucm-conf/alsa-ucm-conf.changes 2022-06-21 17:15:37.450358616 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.1523/alsa-ucm-conf.changes 2022-07-21 11:33:22.706947287 +0200 @@ -1,0 +2,7 @@ +Mon Jul 18 07:07:25 UTC 2022 - Takashi Iwai <[email protected]> + +- Update to version 1.2.7.2: + updates of various device-specific profiles. For details, see + https://www.alsa-project.org/wiki/Changes_v1.2.7.1_v1.2.7.2#alsa-ucm-conf + +------------------------------------------------------------------- Old: ---- alsa-ucm-conf-1.2.7.1.tar.bz2 alsa-ucm-conf-1.2.7.1.tar.bz2.sig New: ---- alsa-ucm-conf-1.2.7.2.tar.bz2 alsa-ucm-conf-1.2.7.2.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-ucm-conf.spec ++++++ --- /var/tmp/diff_new_pack.KWnxYl/_old 2022-07-21 11:33:23.182947696 +0200 +++ /var/tmp/diff_new_pack.KWnxYl/_new 2022-07-21 11:33:23.186947699 +0200 @@ -17,7 +17,7 @@ Name: alsa-ucm-conf -Version: 1.2.7.1 +Version: 1.2.7.2 Release: 0 Summary: ALSA UCM Profiles License: BSD-3-Clause ++++++ alsa-ucm-conf-1.2.7.1.tar.bz2 -> alsa-ucm-conf-1.2.7.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/Intel/sof-hda-dsp/HiFi.conf new/alsa-ucm-conf-1.2.7.2/ucm2/Intel/sof-hda-dsp/HiFi.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/Intel/sof-hda-dsp/HiFi.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/Intel/sof-hda-dsp/HiFi.conf 2022-07-08 17:20:39.000000000 +0200 @@ -2,7 +2,7 @@ SectionVerb { EnableSequence [ - devdisall "" + disdevall "" ] Value.TQ "HiFi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/Tegra/max98090/HiFi.conf new/alsa-ucm-conf-1.2.7.2/ucm2/Tegra/max98090/HiFi.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/Tegra/max98090/HiFi.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/Tegra/max98090/HiFi.conf 2022-07-08 17:20:39.000000000 +0200 @@ -1,73 +1,99 @@ SectionVerb { EnableSequence [ - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Headphone Left Switch' on" - cset "name='Headphone Right Switch' on" - cset "name='Digital EQ 3 Band Switch' off" - cset "name='Digital EQ 5 Band Switch' off" - cset "name='Digital EQ 7 Band Switch' off" - cset "name='Biquad Switch' off" - cset "name='Filter Mode' Music" - cset "name='ADC Oversampling Rate' 0" - cset "name='DMIC Mux' DMIC" - cset "name='MIC2 Mux' IN34" - cset "name='Right ADC Mixer MIC2 Switch' on" - cset "name='Left ADC Mixer MIC2 Switch' on" - cset "name='MIC2 Volume' 10" - cset "name='MIC2 Boost Volume' 0" - cset "name='Mic Jack Switch' off" - cset "name='Int Mic Switch' on" - cset "name='ADCR Boost Volume' 4" - cset "name='ADCL Boost Volume' 4" - cset "name='ADCR Volume' 11" - cset "name='ADCL Volume' 11" - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Speaker Left Mixer Volume' 2" - cset "name='Speaker Right Mixer Volume' 2" - cset "name='Record Path DC Blocking' on" - cset "name='Playback Path DC Blocking' on" - cset "name='Headphone Left Switch' on" - cset "name='Headphone Right Switch' on" + cset "name='Speakers Switch' off" cset "name='Headphones Switch' off" - cset "name='Speaker Left Switch' on" - cset "name='Speaker Right Switch' on" - cset "name='Speakers Switch' on" + cset "name='Mic Jack Switch' off" + cset "name='Int Mic Switch' off" ] } -SectionDevice."Headphones" { +SectionDevice."Speakers" { + Comment = "Speakers" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speakers Switch' on" + ] + + DisableSequence [ + cset "name='Speakers Switch' off" + ] + Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + PlaybackVolume "Speaker Volume" } +} + +SectionDevice."Headphones" { + Comment = "Headphones" + + ConflictingDevice [ + "Speakers" + ] + EnableSequence [ - cset "name='Speakers Switch' off" cset "name='Headphones Switch' on" ] + DisableSequence [ cset "name='Headphones Switch' off" - cset "name='Speakers Switch' on" ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackVolume "Headphone Volume" + JackControl "Headphone Jack" + } + } SectionDevice."Mic" { + Comment "Internal Microphone" + + EnableSequence [ + cset "name='Int Mic Switch' on" + cset "name='DMIC Mux' DMIC" + ] + + DisableSequence [ + cset "name='Int Mic Switch' off" + cset "name='DMIC Mux' ADC" + ] + Value { - CapturePriority 100 CapturePCM "hw:${CardId}" - #CaptureControl "MIC2" + CaptureChannels 2 + CaptureVolume "MIC2 Volume" } +} + +SectionDevice."Headset" { + Comment = "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + EnableSequence [ - cset "name='Int Mic Switch' off" - cset "name='DMIC Mux' ADC" cset "name='Mic Jack Switch' on" - cset "name='Record Path DC Blocking' on" + cset "name='DMIC Mux' ADC" ] + DisableSequence [ cset "name='Mic Jack Switch' off" cset "name='DMIC Mux' DMIC" - cset "name='Int Mic Switch' on" - cset "name='Record Path DC Blocking' off" ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + #CaptureControl "MIC2" + JackControl "Mic Jack" + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/Tegra/max98090/max98090.conf new/alsa-ucm-conf-1.2.7.2/ucm2/Tegra/max98090/max98090.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/Tegra/max98090/max98090.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/Tegra/max98090/max98090.conf 2022-07-08 17:20:39.000000000 +0200 @@ -4,3 +4,40 @@ File "/Tegra/max98090/HiFi.conf" Comment "Default" } + +BootSequence [ + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='Right ADC Mixer MIC2 Switch' on" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 0" + cset "name='Mic Jack Switch' off" + cset "name='Int Mic Switch' off" + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Speaker Left Mixer Volume' 2" + cset "name='Speaker Right Mixer Volume' 2" + cset "name='Record Path DC Blocking' on" + cset "name='Playback Path DC Blocking' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Headphones Switch' off" + cset "name='Speaker Left Switch' on" + cset "name='Speaker Right Switch' on" + cset "name='Speakers Switch' off" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-0003.conf 2022-07-08 17:20:39.000000000 +0200 @@ -0,0 +1,11 @@ +Comment "Audient iD4 USB-Audio" + +SectionUseCase."HiFi" { + Comment "Default Alsa Profile" + File "/USB-Audio/Audient/Audient-iD4-HiFi-0003.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.7.1/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-0009.conf 2022-07-08 17:20:39.000000000 +0200 @@ -0,0 +1,11 @@ +Comment "Audient iD4 USB-Audio" + +SectionUseCase."HiFi" { + Comment "Default Alsa Profile" + File "/USB-Audio/Audient/Audient-iD4-HiFi-0009.conf" +} + +Define.DirectPlaybackChannels 4 +Define.DirectCaptureChannels 4 + +Include.dhw.File "/common/direct.conf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0003.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0003.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0003.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0003.conf 2022-07-08 17:20:39.000000000 +0200 @@ -0,0 +1,55 @@ +Include.pcm_split.File "/common/pcm/split.conf" + +Macro [ + { + SplitPCM { + Name "id4_mono_in" + Direction Capture + Channels 1 + HWChannels 2 + HWChannelPos0 FL + HWChannelPos1 FR + } + } +] + +SectionDevice."Headphones" { + Comment "Headphones / Monitor" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Mic" { + Comment "XLR Microphone" + + Value { + CapturePriority 200 + } + Macro.pcm_split.SplitPCMDevice { + Name "id4_mono_in" + Direction Capture + HWChannels 2 + Channels 1 + Channel0 0 + ChannelPos0 MONO + } +} + +SectionDevice."Line" { + Comment "DI Input" + + Value { + CapturePriority 100 + } + Macro.pcm_split.SplitPCMDevice { + Name "id4_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.7.1/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0009.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0009.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0009.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-HiFi-0009.conf 2022-07-08 17:20:39.000000000 +0200 @@ -0,0 +1,100 @@ +Include.pcm_split.File "/common/pcm/split.conf" + +Macro [ + { + SplitPCM { + Name "id4_stereo_out" + Direction Playback + Channels 2 + HWChannels 4 + HWChannelPos0 FL + HWChannelPos1 FR + HWChannelPos2 FL + HWChannelPos3 FR + } + } + { + SplitPCM { + Name "id4_stereo_in" + Direction Capture + Channels 2 + HWChannels 4 + HWChannelPos0 FL + HWChannelPos1 FR + HWChannelPos2 FL + HWChannelPos3 FR + } + } +] + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + } + Macro.pcm_split.SplitPCMDevice { + Name "id4_stereo_out" + Direction Playback + HWChannels 4 + Channels 2 + Channel0 2 + Channel1 3 + ChannelPos0 FL + ChannelPos1 FR + } +} + +SectionDevice."Headphones" { + Comment "Headphones / Monitor" + + Value { + PlaybackPriority 200 + } + Macro.pcm_split.SplitPCMDevice { + Name "id4_stereo_out" + Direction Playback + HWChannels 4 + Channels 2 + Channel0 0 + Channel1 1 + ChannelPos0 FL + ChannelPos1 FR + } +} + +SectionDevice."Mic" { + Comment "XLR Microphone" + + Value { + CapturePriority 200 + } + Macro.pcm_split.SplitPCMDevice { + Name "id4_stereo_in" + Direction Capture + HWChannels 4 + Channels 2 + Channel0 0 + Channel1 1 + ChannelPos0 FL + ChannelPos1 FR + } +} + +SectionDevice."Line1" { + Comment "Line Input" + + Value { + CapturePriority 100 + } + Macro.pcm_split.SplitPCMDevice { + Name "id4_stereo_in" + Direction Capture + HWChannels 4 + Channels 2 + Channel0 2 + Channel1 3 + ChannelPos0 FL + ChannelPos1 FR + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-HiFi.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-HiFi.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4-HiFi.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4-HiFi.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -Include.pcm_split.File "/common/pcm/split.conf" - -Macro [ - { - SplitPCM { - Name "id4_stereo_out" - Direction Playback - Channels 2 - HWChannels 4 - HWChannelPos0 FL - HWChannelPos1 FR - HWChannelPos2 FL - HWChannelPos3 FR - } - } - { - SplitPCM { - Name "id4_stereo_in" - Direction Capture - Channels 2 - HWChannels 4 - HWChannelPos0 FL - HWChannelPos1 FR - HWChannelPos2 FL - HWChannelPos3 FR - } - } -] - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - } - Macro.pcm_split.SplitPCMDevice { - Name "id4_stereo_out" - Direction Playback - HWChannels 4 - Channels 2 - Channel0 2 - Channel1 3 - ChannelPos0 FL - ChannelPos1 FR - } -} - -SectionDevice."Headphones" { - Comment "Headphones / Monitor" - - Value { - PlaybackPriority 200 - } - Macro.pcm_split.SplitPCMDevice { - Name "id4_stereo_out" - Direction Playback - HWChannels 4 - Channels 2 - Channel0 0 - Channel1 1 - ChannelPos0 FL - ChannelPos1 FR - } -} - -SectionDevice."Mic" { - Comment "XLR Microphone" - - Value { - CapturePriority 200 - } - Macro.pcm_split.SplitPCMDevice { - Name "id4_stereo_in" - Direction Capture - HWChannels 4 - Channels 2 - Channel0 0 - Channel1 1 - ChannelPos0 FL - ChannelPos1 FR - } -} - -SectionDevice."Line1" { - Comment "Line Input" - - Value { - CapturePriority 100 - } - Macro.pcm_split.SplitPCMDevice { - Name "id4_stereo_in" - Direction Capture - HWChannels 4 - Channels 2 - Channel0 2 - Channel1 3 - ChannelPos0 FL - ChannelPos1 FR - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Audient/Audient-iD4.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Audient/Audient-iD4.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -Comment "Audient iD4 USB-Audio" - -SectionUseCase."HiFi" { - Comment "Default Alsa Profile" - File "/USB-Audio/Audient/Audient-iD4-HiFi.conf" -} - -Define.DirectPlaybackChannels 4 -Define.DirectCaptureChannels 4 - -Include.dhw.File "/common/direct.conf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf 2022-07-08 17:20:39.000000000 +0200 @@ -25,13 +25,23 @@ } ] +Define.PCMCTLName "PCM Playback" + +If.pcm_controls { + Condition { + Type ControlExists + Control "name='UMC204HD 192k Output Playback Switch'" + } + True.Define.PCMCTLName "UMC204HD 192k Output Playback" +} + Include.ctl_remap.File "/common/ctl/remap.conf" Macro [ { CtlRemapStereoVolSw { Dst "Line A Playback" - Src "UMC204HD 192k Output Playback" + Src "${var:PCMCTLName}" Index0 0 Index1 1 } @@ -39,7 +49,7 @@ { CtlRemapStereoVolSw { Dst "Line B Playback" - Src "UMC204HD 192k Output Playback" + Src "${var:PCMCTLName}" Index0 2 Index1 3 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf 2022-07-08 17:20:39.000000000 +0200 @@ -4,6 +4,7 @@ Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" If.Headphone_ctl { Condition { @@ -25,6 +26,7 @@ Value { PlaybackPriority 200 PlaybackPCM "hw:${CardId},1" + JackControl "Line Out Jack" If.Line_ctl { Condition { @@ -40,12 +42,13 @@ } } -SectionDevice."Mic" { - Comment "Microphone" +SectionDevice."Headset" { + Comment "Headset Microphone" Value { CapturePriority 100 CapturePCM "hw:${CardId}" + JackControl "Headset Mic Jack" If.Mic_ctl { Condition { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf 2022-07-08 17:20:39.000000000 +0200 @@ -0,0 +1,52 @@ +Include.pcm_split.File "/common/pcm/split.conf" + +Macro [ + { + SplitPCM { + Name "z1_stereo_out" + Direction Playback + Channels 2 + HWChannels 4 + HWChannelPos0 FL + HWChannelPos1 FR + HWChannelPos2 FL + HWChannelPos3 FR + } + } +] + +SectionDevice."Line" { + Comment "Line Out" + + Value { + PlaybackPriority 200 + } + Macro.pcm_split.SplitPCMDevice { + Name "z1_stereo_out" + Direction Playback + HWChannels 4 + Channels 2 + Channel0 0 + Channel1 1 + ChannelPos0 FL + ChannelPos1 FR + } +} + +SectionDevice."Headphone" { + Comment "Headphone Out" + Value { + PlaybackPriority 100 + } + Macro.pcm_split.SplitPCMDevice { + Name "z1_stereo_out" + Direction Playback + HWChannels 4 + Channels 2 + Channel0 2 + Channel1 3 + ChannelPos0 FL + ChannelPos1 FR + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1.conf 2022-07-08 17:20:39.000000000 +0200 @@ -0,0 +1,11 @@ +Comment "Traktor Kontrol Z1" + +SectionUseCase."Mixer" { + Comment "Default" + File "/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf" +} + +Define.DirectPlaybackChannels 2 + +Include.dhw.File "/common/direct.conf" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/USB-Audio.conf new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/USB-Audio.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/USB-Audio/USB-Audio.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/USB-Audio/USB-Audio.conf 2022-07-08 17:20:39.000000000 +0200 @@ -2,6 +2,7 @@ Define.ProfileName "" Define.MixerRemap "" +Define.SplitPCMPeriodTime 10000 # 10ms If.linked { Condition { @@ -157,6 +158,15 @@ True.Define.ProfileName "Lenovo/ThinkStation-P620-Main" } +If.kontrolz1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17cc:1210" + } + True.Define.ProfileName "NativeInstruments/Traktor-Kontrol-Z1" +} + If.minifuse2 { Condition { Type String @@ -166,13 +176,22 @@ True.Define.ProfileName "Arturia/Minifuse-2" } -If.id4 { +If.id4-0003 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB2708:0003" + } + True.Define.ProfileName "Audient/Audient-iD4-0003" +} + +If.id4-0009 { Condition { Type String Haystack "${CardComponents}" Needle "USB2708:0009" } - True.Define.ProfileName "Audient/Audient-iD4" + True.Define.ProfileName "Audient/Audient-iD4-0009" } If.mixremap { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/common/ctl/remap.conf new/alsa-ucm-conf-1.2.7.2/ucm2/common/ctl/remap.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/common/ctl/remap.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/common/ctl/remap.conf 2022-07-08 17:20:39.000000000 +0200 @@ -14,10 +14,10 @@ DefineMacro.CtlRemapMonoVolSw { LibraryConfig.pcm.SubstiConfig { ctl.default.map { - "name='${var:__Src} Volume'"."name='${var:__Dst} Volume'" { + "name='${var:__Dst} Volume'"."name='${var:__Src} Volume'" { vindex.0 "${evali:$__Index}" } - "name='${var:__Src} Switch'"."name='${var:__Dst} Switch'" { + "name='${var:__Dst} Switch'"."name='${var:__Src} Switch'" { vindex.0 "${evali:$__Index}" } } @@ -37,11 +37,11 @@ DefineMacro.CtlRemapStereoVolSw { LibraryConfig.pcm.SubstiConfig { ctl.default.map { - "name='${var:__Src} Volume'"."name='${var:__Dst} Volume'" { + "name='${var:__Dst} Volume'"."name='${var:__Src} Volume'" { vindex.0 "${evali:$__Index0}" vindex.1 "${evali:$__Index1}" } - "name='${var:__Src} Switch'"."name='${var:__Dst} Switch'" { + "name='${var:__Dst} Switch'"."name='${var:__Src} Switch'" { vindex.0 "${evali:$__Index0}" vindex.1 "${evali:$__Index1}" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/common/direct-verb.conf new/alsa-ucm-conf-1.2.7.2/ucm2/common/direct-verb.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/common/direct-verb.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/common/direct-verb.conf 2022-07-08 17:20:39.000000000 +0200 @@ -4,7 +4,7 @@ If.p { Condition { Type String - Empty "${var:DirectPlaybackChannels}" + Empty "${var:-DirectPlaybackChannels}" } False { PlaybackPriority 1000 @@ -15,7 +15,7 @@ If.c { Condition { Type String - Empty "${var:DirectCaptureChannels}" + Empty "${var:-DirectCaptureChannels}" } False { CapturePriority 1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/common/direct.conf new/alsa-ucm-conf-1.2.7.2/ucm2/common/direct.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/common/direct.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/common/direct.conf 2022-07-08 17:20:39.000000000 +0200 @@ -1,7 +1,7 @@ If.direct { Condition { Type String - Empty "${var:DirectCardName}" + Empty "${var:-DirectCardName}" } True.Define.DirectCardName "${CardName}" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/common/pcm/split.conf new/alsa-ucm-conf-1.2.7.2/ucm2/common/pcm/split.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/common/pcm/split.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/common/pcm/split.conf 2022-07-08 17:20:39.000000000 +0200 @@ -23,6 +23,23 @@ Empty "${var:@SplitPCM}" } True { + If.period_time { + Condition { + Type String + Empty "${var:-SplitPCMPeriodTime}" + } + True.Define.__period_time 20000 + False.Define.__period_time "${var:SplitPCMPeriodTime}" + } + If.buffer_time { + Condition { + Type String + Empty "${var:-SplitPCMBufferTime}" + } + True.Define.__buffer_time 500000 + False.Define.__buffer_time "${var:SplitPCMBufferTime}" + } + LibraryConfig.pcm.SubstiConfig.pcm."${var:__Name}" { @args [ CARD DEV CHN0 ] @args { @@ -40,6 +57,8 @@ chmap [ "${var:__HWChannelPos0}" ] } channels "${evali:$__HWChannels}" + period_time "${evali:$__period_time}" + buffer_time "${evali:$__buffer_time}" } bindings.0 $CHN0 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/sof-soundwire/HiFi.conf new/alsa-ucm-conf-1.2.7.2/ucm2/sof-soundwire/HiFi.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/sof-soundwire/HiFi.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/sof-soundwire/HiFi.conf 2022-07-08 17:20:39.000000000 +0200 @@ -2,7 +2,7 @@ SectionVerb { EnableSequence [ - devdisall "" + disdevall "" ] Value.TQ "HiFi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/sof-soundwire/rt711-sdca.conf new/alsa-ucm-conf-1.2.7.2/ucm2/sof-soundwire/rt711-sdca.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/sof-soundwire/rt711-sdca.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/sof-soundwire/rt711-sdca.conf 2022-07-08 17:20:39.000000000 +0200 @@ -22,11 +22,11 @@ Comment "Headset Microphone" EnableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 1" + cset "name='rt711 FU0F Capture Switch' 1" ] DisableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 0" + cset "name='rt711 FU0F Capture Switch' 0" ] Value { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.7.1/ucm2/sof-soundwire/rt711.conf new/alsa-ucm-conf-1.2.7.2/ucm2/sof-soundwire/rt711.conf --- old/alsa-ucm-conf-1.2.7.1/ucm2/sof-soundwire/rt711.conf 2022-06-17 11:44:16.000000000 +0200 +++ new/alsa-ucm-conf-1.2.7.2/ucm2/sof-soundwire/rt711.conf 2022-07-08 17:20:39.000000000 +0200 @@ -22,18 +22,18 @@ Comment "Headset Microphone" EnableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 1" + cset "name='rt711 ADC 08 Capture Switch' 1" ] DisableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 0" + cset "name='rt711 ADC 08 Capture Switch' 0" ] Value { CapturePriority 200 CapturePCM "hw:${CardId},1" JackControl "Headset Mic Jack" - CaptureSwitch "PGA2.0 2 Master Capture Switch" - CaptureVolume "PGA2.0 2 Master Capture Volume" + CaptureSwitch "rt711 ADC 08 Capture Switch" + CaptureVolume "rt711 ADC 08 Capture Volume" } }
