audioreach: fix the pcm ids

For some reason we ended up with pcm id starting at 1 instead of 0.
Fix this.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

14 files changed, 41 insertions, 41 deletions

diff --git a/Google-SC7180-WSA-Speakers-SEC-I2S-VA-DMIC-WCD-TX3.m4 b/Google-SC7180-WSA-Speakers-SEC-I2S-VA-DMIC-WCD-TX3.m4
index 1be5b71..b624910 100644
--- a/Google-SC7180-WSA-Speakers-SEC-I2S-VA-DMIC-WCD-TX3.m4
+++ b/Google-SC7180-WSA-Speakers-SEC-I2S-VA-DMIC-WCD-TX3.m4
@@ -69,8 +69,8 @@ dnl
 STREAM_DEVICE_PLAYBACK_MIXER(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 dnl
-STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 dnl
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'', ``TX_CODEC_DMA_TX_3'')
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA4, ``VA_CODEC_DMA_TX_0'', ``TX_CODEC_DMA_TX_3'')
diff --git a/Qualcomm-RB5-WSA8815-Speakers-DMIC0-compress.m4 b/Qualcomm-RB5-WSA8815-Speakers-DMIC0-compress.m4
index 55c84db..34c15d3 100644
--- a/Qualcomm-RB5-WSA8815-Speakers-DMIC0-compress.m4
+++ b/Qualcomm-RB5-WSA8815-Speakers-DMIC0-compress.m4
@@ -60,8 +60,8 @@ dnl
 STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(TERTIARY_MI2S_RX, ``Tertiary'', ``MultiMedia1'', ``MultiMedia2'')
 dnl
-STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(TERTIARY_MI2S_RX, ``Tertiary Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(TERTIARY_MI2S_RX, ``Tertiary Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 dnl
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'')
 STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA3, ``MultiMedia3 Mixer'', ``VA_CODEC_DMA_TX_0, device110.logger1'')
diff --git a/Qualcomm-RB5-WSA8815-Speakers-DMIC0.m4 b/Qualcomm-RB5-WSA8815-Speakers-DMIC0.m4
index 368606c..89d4b20 100644
--- a/Qualcomm-RB5-WSA8815-Speakers-DMIC0.m4
+++ b/Qualcomm-RB5-WSA8815-Speakers-DMIC0.m4
@@ -60,8 +60,8 @@ dnl
 STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(TERTIARY_MI2S_RX, ``TERTIARY_MI2S_RX'', ``MultiMedia1'', ``MultiMedia2'')
 dnl
-STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(TERTIARY_MI2S_RX, ``TERTIARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(TERTIARY_MI2S_RX, ``TERTIARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 dnl
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'')
 STREAM_DEVICE_CAPTURE_ROUTE(FRONTEND_DAI_MULTIMEDIA3, ``MultiMedia3 Mixer'', ``VA_CODEC_DMA_TX_0, device110.logger1'')
diff --git a/SC8280XP-LENOVO-X13S.m4 b/SC8280XP-LENOVO-X13S.m4
index 8813885..6b7fbfd 100644
--- a/SC8280XP-LENOVO-X13S.m4
+++ b/SC8280XP-LENOVO-X13S.m4
@@ -70,8 +70,8 @@ DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_
 STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 
-STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 
 dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )
diff --git a/SM8250-MTP-WCD9380-WSA8810-VA-DMIC.m4 b/SM8250-MTP-WCD9380-WSA8810-VA-DMIC.m4
index 8b0ab00..ff6c788 100644
--- a/SM8250-MTP-WCD9380-WSA8810-VA-DMIC.m4
+++ b/SM8250-MTP-WCD9380-WSA8810-VA-DMIC.m4
@@ -77,9 +77,9 @@ STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``Multi
 STREAM_DEVICE_PLAYBACK_MIXER(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 
-STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(SECONDARY_MI2S_RX, ``SECONDARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 
 dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )
diff --git a/SM8450-HDK.m4 b/SM8450-HDK.m4
index a5449b9..9b530f7 100644
--- a/SM8450-HDK.m4
+++ b/SM8450-HDK.m4
@@ -77,9 +77,9 @@ STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``Multi
 STREAM_DEVICE_PLAYBACK_MIXER(PRIMARY_MI2S_RX, ``PRIMARY_MI2S_RX'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 
-STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(PRIMARY_MI2S_RX, ``PRIMARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(PRIMARY_MI2S_RX, ``PRIMARY_MI2S_RX Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 
 dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )
diff --git a/SM8550-QRD.m4 b/SM8550-QRD.m4
index f63b6c3..4c91869 100644
--- a/SM8550-QRD.m4
+++ b/SM8550-QRD.m4
@@ -68,8 +68,8 @@ DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_
 STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
 
-STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
-STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream1.logger1'', ``MultiMedia2, stream2.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
+STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
 
 dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
 STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )
diff --git a/audioreach/audioreach.m4 b/audioreach/audioreach.m4
index 34b2945..cbe8c42 100644
--- a/audioreach/audioreach.m4
+++ b/audioreach/audioreach.m4
@@ -106,14 +106,14 @@ define(`MODULE_ID_VOL_CTRL', `0x0700101B') dnl
 define(`MODULE_ID_SMECNS_V2', `0x07001031') dnl
 define(`MODULE_ID_DISPLAY_PORT_SINK', `0x07001069') dnl
 dnl Linux frontend dai ids
-define(`FRONTEND_DAI_MULTIMEDIA1', `1') dnl
-define(`FRONTEND_DAI_MULTIMEDIA2', `2') dnl
-define(`FRONTEND_DAI_MULTIMEDIA3', `3') dnl
-define(`FRONTEND_DAI_MULTIMEDIA4', `4') dnl
-define(`FRONTEND_DAI_MULTIMEDIA5', `5') dnl
-define(`FRONTEND_DAI_MULTIMEDIA6', `6') dnl
-define(`FRONTEND_DAI_MULTIMEDIA7', `7') dnl
-define(`FRONTEND_DAI_MULTIMEDIA8', `8') dnl
+define(`FRONTEND_DAI_MULTIMEDIA1', `0') dnl
+define(`FRONTEND_DAI_MULTIMEDIA2', `1') dnl
+define(`FRONTEND_DAI_MULTIMEDIA3', `2') dnl
+define(`FRONTEND_DAI_MULTIMEDIA4', `3') dnl
+define(`FRONTEND_DAI_MULTIMEDIA5', `4') dnl
+define(`FRONTEND_DAI_MULTIMEDIA6', `5') dnl
+define(`FRONTEND_DAI_MULTIMEDIA7', `6') dnl
+define(`FRONTEND_DAI_MULTIMEDIA8', `7') dnl
 dnl Audio Process Manager (APM) virtual ports IDs 
 define(`HDMI_RX', `1') dnl
 define(`SLIMBUS_0_RX', `2') dnl
diff --git a/audioreach/module_rdsh.m4 b/audioreach/module_rdsh.m4
index 191bdb9..eb65a86 100644
--- a/audioreach/module_rdsh.m4
+++ b/audioreach/module_rdsh.m4
@@ -28,7 +28,7 @@ define(`AR_MODULE_RDSH',
 `        index STR($1)'
 `        type "aif_out"'
 `        no_pm "true"'
-`        stream_name "MultiMedia$11 Capture"'
+`        stream_name "`MultiMedia'eval($11 + 1)` Capture'"'
 `        subseq "10"'
 `        data ['
 `                "NAME_PREFIX.sub_graph$2_data"'
diff --git a/audioreach/module_vol_ctrl.m4 b/audioreach/module_vol_ctrl.m4
index 489ffc7..441bb87 100644
--- a/audioreach/module_vol_ctrl.m4
+++ b/audioreach/module_vol_ctrl.m4
@@ -37,18 +37,18 @@ define(`AR_MODULE_VOL_CTRL',
 `                "NAME_PREFIX.vol_ctrl$1_data"'
 `        ]'
 `	mixer ['
-`		"MultiMedia$1 Playback Volume"'
+`		"`MultiMedia'eval($1 + 1)` Playback Volume'"'
 `	]'
 `}'
 `'
-`SectionTLV."MultiMedia$1_playback_vol_ctrl_tlv" {'
+`SectionTLV."`MultiMedia'eval($1 + 1)`_playback_vol_ctrl_tlv'" {'
 `	scale {'
 `		min "0"'
 `		step "100"'
 `		mute "0"'
 `	}'
 `}'
-`SectionControlMixer."MultiMedia$1 Playback Volume" {'
+`SectionControlMixer."`MultiMedia'eval($1 + 1)` Playback Volume'" {'
 `	Comment "Stream Global volume"'
 `'
 `	# control belongs to this index group'
@@ -74,5 +74,5 @@ define(`AR_MODULE_VOL_CTRL',
 `		get "257"'
 `		put "257"'
 `	}'
-`	tlv "MultiMedia$1_playback_vol_ctrl_tlv"'
+`	tlv "`MultiMedia'eval($1 + 1)`_playback_vol_ctrl_tlv'"'
 `}') dnl
diff --git a/audioreach/module_wrsh.m4 b/audioreach/module_wrsh.m4
index c3e38e8..6fdabb5 100644
--- a/audioreach/module_wrsh.m4
+++ b/audioreach/module_wrsh.m4
@@ -28,7 +28,7 @@ define(`AR_MODULE_WRSH',
 `        index STR($1)'
 `        type "aif_in"'
 `        no_pm "true"'
-`        stream_name "MultiMedia$11 Playback"'
+`        stream_name "`MultiMedia'eval($11 + 1)` Playback'"'
 `        subseq "10"'
 `        data ['
 `                "NAME_PREFIX.sub_graph$2_data"'
diff --git a/audioreach/subgraph-stream-capture.m4 b/audioreach/subgraph-stream-capture.m4
index 0f4d3fb..6722fbc 100644
--- a/audioreach/subgraph-stream-capture.m4
+++ b/audioreach/subgraph-stream-capture.m4
@@ -50,7 +50,7 @@ define(`STREAM_CAPTURE_ROUTE',
 `SectionGraph."NAME_PREFIX.$1 Graph" {'
 `        index STR($1)'
 `        lines ['
-`                "NAME_PREFIX.logger$1, , MultiMedia$2 Mixer"'
+`                "NAME_PREFIX.logger$1, , `MultiMedia'eval($2 + 1)` Mixer'"'
 `                "NAME_PREFIX.mfc$1, , NAME_PREFIX.logger$1"'
 `                "NAME_PREFIX.pcm_converter$1, , NAME_PREFIX.mfc$1"'
 `                "NAME_PREFIX.pcm_encoder$1, , NAME_PREFIX.pcm_converter$1"'
diff --git a/util/mixer.m4 b/util/mixer.m4
index 3995fc0..2dd00cb 100644
--- a/util/mixer.m4
+++ b/util/mixer.m4
@@ -10,7 +10,7 @@ dnl
 dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index)
 define(`STREAM_DEVICE_CAPTURE_MIXER',
 `'
-`SectionWidget."MultiMedia$1 Mixer" {'
+`SectionWidget."`MultiMedia'eval($1 + 1)` Mixer'" {'
 `    	reg "-1"'
 `        index STR($1)'
 `        type "mixer"'
@@ -69,7 +69,7 @@ dnl
 dnl STREAM_PLAYBACK_MIXER(stream-index, sg-index)
 define(`STREAM_PLAYBACK_MIXER',
 `'
-`SectionControlMixer."MultiMedia$1" {'
+`SectionControlMixer."`MultiMedia'eval($1 + 1)" {'
 `	reg "-1"'
 `	index STR($1)'
 `	max "1"'
diff --git a/util/pcm.m4 b/util/pcm.m4
index a7f6310..bc7254b 100644
--- a/util/pcm.m4
+++ b/util/pcm.m4
@@ -4,7 +4,7 @@ include(`util/util.m4') dnl
 dnl AR_PCM_PLAYBACK(index, formats, rate_min, rate_max, ch_min, ch_max)
 define(`AR_PCM_PLAYBACK',
 `'
-`SectionPCMCapabilities."MultiMedia$1 Playback" {'
+`SectionPCMCapabilities."`MultiMedia'eval($1 +1 )` Playback'" {'
 `        formats STR($2)'
 `        rate_min STR($3)'
 `        rate_max STR($4)'
@@ -12,26 +12,26 @@ define(`AR_PCM_PLAYBACK',
 `        channels_max STR($6)'
 `}'
 `'
-`SectionPCM."MultiMedia$1 Playback" {'
+`SectionPCM."`MultiMedia'eval($1 + 1)` Playback'" {'
 `'
 `        index STR($1)'
 `'
 `        # used for binding to the PCM'
 `        id STR($1)'
 `'
-`        dai."MultiMedia$1 Playback" {'
+`        dai."`MultiMedia'eval($1 + 1)` Playback'" {'
 `                id STR($1)'
 `        }'
 `'
 `        pcm."playback" {'
-`                capabilities "MultiMedia$1 Playback"'
+`                capabilities "`MultiMedia'eval($1 + 1)` Playback'"'
 `        }'
 `}') dnl
 dnl
 dnl AR_PCM_CAPTURE(index, formats, rate_min, rate_max, ch_min, ch_max)
 define(`AR_PCM_CAPTURE',
 `'
-`SectionPCMCapabilities."MultiMedia$1 Capture" {'
+`SectionPCMCapabilities."`MultiMedia'eval($1 +1 )` Capture'" {'
 `'
 `        formats STR($2)'
 `        rate_min STR($3)'
@@ -40,19 +40,19 @@ define(`AR_PCM_CAPTURE',
 `        channels_max STR($6)'
 `}'
 `'
-`SectionPCM."MultiMedia$1 Capture" {'
+`SectionPCM."`MultiMedia'eval($1 + 1)` Capture'" {'
 `'
 `        index STR($1)'
 `'
 `        # used for binding to the PCM'
 `        id STR($1)'
 `'
-`        dai."MultiMedia$1 Capture" {'
+`        dai."`MultiMedia'eval($1 + 1)` Capture'" {'
 `                id STR($1)'
 `        }'
 `'
 `        pcm."capture" {'
-`                capabilities "MultiMedia$1 Capture"'
+`                capabilities "`MultiMedia'eval($1 + 1)` Capture'"'
 `        }'
 `}')
 dnl AR_COMPESS_PLAYBACK(index, formats, rate_min, rate_max, ch_min, ch_max)