From: Jaroslav Kysela Date: Wed, 4 Feb 2026 12:40:31 +0000 (+0100) Subject: common: split.conf - put macro arguments to one string X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=a77265313c419ada8c06ea34e1ddff9bc4c2e1d1;p=alsa-ucm-conf.git common: split.conf - put macro arguments to one string Make config a little bit shorter. Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/common/pcm/split.conf b/ucm2/common/pcm/split.conf index b1f3dfa..0a4b32c 100644 --- a/ucm2/common/pcm/split.conf +++ b/ucm2/common/pcm/split.conf @@ -118,46 +118,46 @@ DefineMacro.SplitPCM.If.a { bindings.0 $CHN0 } - Macro.pos1.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos1}" } - Macro.pos2.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos2}" } - Macro.pos3.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos3}" } - Macro.pos4.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos4}" } - Macro.pos5.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos5}" } - Macro.pos6.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos6}" } - Macro.pos7.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos7}" } - Macro.pos8.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos8}" } - Macro.pos9.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos9}" } - Macro.pos10.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos10}" } - Macro.pos11.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos11}" } - Macro.pos12.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos12}" } - Macro.pos13.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos13}" } - Macro.pos14.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos14}" } - Macro.pos15.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos15}" } - Macro.pos16.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos16}" } - Macro.pos17.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos17}" } - Macro.pos18.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos18}" } - Macro.pos19.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos19}" } - Macro.pos20.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos20}" } - Macro.pos21.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos21}" } - Macro.pos22.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos22}" } - Macro.pos23.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos23}" } - Macro.pos24.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos24}" } - Macro.pos25.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos25}" } - Macro.pos26.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos26}" } - Macro.pos27.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos27}" } - Macro.pos28.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos28}" } - Macro.pos29.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos29}" } - Macro.pos30.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos30}" } - Macro.pos31.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos31}" } - Macro.pos32.SplitPCM_chnpos { HWChannelPos="${var:-__HWChannelPos32}" } + Macro.pos1.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos1}'" + Macro.pos2.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos2}'" + Macro.pos3.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos3}'" + Macro.pos4.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos4}'" + Macro.pos5.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos5}'" + Macro.pos6.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos6}'" + Macro.pos7.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos7}'" + Macro.pos8.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos8}'" + Macro.pos9.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos9}'" + Macro.pos10.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos10}'" + Macro.pos11.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos11}'" + Macro.pos12.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos12}'" + Macro.pos13.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos13}'" + Macro.pos14.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos14}'" + Macro.pos15.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos15}'" + Macro.pos16.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos16}'" + Macro.pos17.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos17}'" + Macro.pos18.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos18}'" + Macro.pos19.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos19}'" + Macro.pos20.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos20}'" + Macro.pos21.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos21}'" + Macro.pos22.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos22}'" + Macro.pos23.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos23}'" + Macro.pos24.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos24}'" + Macro.pos25.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos25}'" + Macro.pos26.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos26}'" + Macro.pos27.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos27}'" + Macro.pos28.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos28}'" + Macro.pos29.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos29}'" + Macro.pos30.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos30}'" + Macro.pos31.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos31}'" + Macro.pos32.SplitPCM_chnpos "HWChannelPos='${var:-__HWChannelPos32}'" - Macro.ch1.SplitPCM_chn { ChIndex=1 ChRegex="^([2-9]|[1-9][0-9])$" } - Macro.ch2.SplitPCM_chn { ChIndex=2 ChRegex="^([3-9]|[1-9][0-9])$" } - Macro.ch3.SplitPCM_chn { ChIndex=3 ChRegex="^([4-9]|[1-9][0-9])$" } - Macro.ch4.SplitPCM_chn { ChIndex=4 ChRegex="^([5-9]|[1-9][0-9])$" } - Macro.ch5.SplitPCM_chn { ChIndex=5 ChRegex="^([6-9]|[1-9][0-9])$" } - Macro.ch6.SplitPCM_chn { ChIndex=6 ChRegex="^([7-9]|[1-9][0-9])$" } - Macro.ch7.SplitPCM_chn { ChIndex=7 ChRegex="^([8-9]|[1-9][0-9])$" } + Macro.ch1.SplitPCM_chn "ChIndex=1 ChRegex='^([2-9]|[1-9][0-9])$'" + Macro.ch2.SplitPCM_chn "ChIndex=2 ChRegex='^([3-9]|[1-9][0-9])$'" + Macro.ch3.SplitPCM_chn "ChIndex=3 ChRegex='^([4-9]|[1-9][0-9])$'" + Macro.ch4.SplitPCM_chn "ChIndex=4 ChRegex='^([5-9]|[1-9][0-9])$'" + Macro.ch5.SplitPCM_chn "ChIndex=5 ChRegex='^([6-9]|[1-9][0-9])$'" + Macro.ch6.SplitPCM_chn "ChIndex=6 ChRegex='^([7-9]|[1-9][0-9])$'" + Macro.ch7.SplitPCM_chn "ChIndex=7 ChRegex='^([8-9]|[1-9][0-9])$'" If.dir { Condition { @@ -209,23 +209,23 @@ DefineMacro.SplitPCMDevice { "${var:__Direction}ChannelPos0" "${var:__ChannelPos0}" } - Macro.chn1.SplitPCMDevice_chnpos { Index=1 Channel="${var:-__Channel1}" ChannelPos="${var:-__ChannelPos1}" } - Macro.chn2.SplitPCMDevice_chnpos { Index=2 Channel="${var:-__Channel2}" ChannelPos="${var:-__ChannelPos2}" } - Macro.chn3.SplitPCMDevice_chnpos { Index=3 Channel="${var:-__Channel3}" ChannelPos="${var:-__ChannelPos3}" } - Macro.chn4.SplitPCMDevice_chnpos { Index=4 Channel="${var:-__Channel4}" ChannelPos="${var:-__ChannelPos4}" } - Macro.chn5.SplitPCMDevice_chnpos { Index=5 Channel="${var:-__Channel5}" ChannelPos="${var:-__ChannelPos5}" } - Macro.chn6.SplitPCMDevice_chnpos { Index=6 Channel="${var:-__Channel6}" ChannelPos="${var:-__ChannelPos6}" } - Macro.chn7.SplitPCMDevice_chnpos { Index=7 Channel="${var:-__Channel7}" ChannelPos="${var:-__ChannelPos7}" } + Macro.chn1.SplitPCMDevice_chnpos "Index=1 Channel='${var:-__Channel1}' ChannelPos='${var:-__ChannelPos1}'" + Macro.chn2.SplitPCMDevice_chnpos "Index=2 Channel='${var:-__Channel2}' ChannelPos='${var:-__ChannelPos2}'" + Macro.chn3.SplitPCMDevice_chnpos "Index=3 Channel='${var:-__Channel3}' ChannelPos='${var:-__ChannelPos3}'" + Macro.chn4.SplitPCMDevice_chnpos "Index=4 Channel='${var:-__Channel4}' ChannelPos='${var:-__ChannelPos4}'" + Macro.chn5.SplitPCMDevice_chnpos "Index=5 Channel='${var:-__Channel5}' ChannelPos='${var:-__ChannelPos5}'" + Macro.chn6.SplitPCMDevice_chnpos "Index=6 Channel='${var:-__Channel6}' ChannelPos='${var:-__ChannelPos6}'" + Macro.chn7.SplitPCMDevice_chnpos "Index=7 Channel='${var:-__Channel7}' ChannelPos='${var:-__ChannelPos7}'" } True { Define.__pcmdev "${var:__Name}:${CardId},${var:__Device},${var:__Channel0}" - Macro.ch1.SplitPCMDevice_addchn { Channel="${var:-__Channel1}" } - Macro.ch2.SplitPCMDevice_addchn { Channel="${var:-__Channel2}" } - Macro.ch3.SplitPCMDevice_addchn { Channel="${var:-__Channel3}" } - Macro.ch4.SplitPCMDevice_addchn { Channel="${var:-__Channel4}" } - Macro.ch5.SplitPCMDevice_addchn { Channel="${var:-__Channel5}" } - Macro.ch6.SplitPCMDevice_addchn { Channel="${var:-__Channel6}" } - Macro.ch7.SplitPCMDevice_addchn { Channel="${var:-__Channel7}" } + Macro.ch1.SplitPCMDevice_addchn "Channel='${var:-__Channel1}'" + Macro.ch2.SplitPCMDevice_addchn "Channel='${var:-__Channel2}'" + Macro.ch3.SplitPCMDevice_addchn "Channel='${var:-__Channel3}'" + Macro.ch4.SplitPCMDevice_addchn "Channel='${var:-__Channel4}'" + Macro.ch5.SplitPCMDevice_addchn "Channel='${var:-__Channel5}'" + Macro.ch6.SplitPCMDevice_addchn "Channel='${var:-__Channel6}'" + Macro.ch7.SplitPCMDevice_addchn "Channel='${var:-__Channel7}'" Value { "${var:__Direction}Channels" "${var:__Channels}" "${var:__Direction}PCM" "${var:__pcmdev}"