topology2: mixout-gain-efx-mbdrc-dai-copier-playback: Use index in ro…

…utes The old notation is not very readable. Also, remove the duplicated eqfir widget block. Signed-off-by: Ranjani Sridharan <[email protected]>
thesofproject · Nov 9, 2023 · 46c210e · 46c210e
1 parent 0c15356
commit 46c210e
Showing 1 changed file with 8 additions and 32 deletions.
diff --git a/.../topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf b/.../topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf
@@ -112,30 +112,6 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 				}
 			}
 		}
-		eqfir."1" {
-			num_input_audio_formats 1
-			num_output_audio_formats 1
-
-			# 32-bit 48KHz 2ch
-			Object.Base.input_audio_format [
-				{
-					in_bit_depth		32
-					in_valid_bit_depth	32
-				}
-			]
-			Object.Base.output_audio_format [
-				{
-					out_bit_depth		32
-					out_valid_bit_depth	32
-				}
-			]
-
-			Object.Control.bytes."1" {
-				IncludeByKey.EFX_FIR_PARAMS {
-					"passthrough" "include/components/eqfir/passthrough.conf"
-				}
-			}
-		}
 		multiband_drc."1" {
 			num_input_audio_formats 1
 			num_output_audio_formats 1
@@ -168,20 +144,20 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" {
 
 	Object.Base {
 		route.1 {
-			source mixout..1
-			sink	gain..1
+			source mixout.$index.1
+			sink	gain.$index.1
 		}
 		route.2 {
-			source gain..1
-			sink	eqiir..1
+			source gain.$index.1
+			sink	eqiir.$index.1
 		}
 		route.3 {
-			source eqiir..1
-			sink	eqfir..1
+			source eqiir.$index.1
+			sink	eqfir.$index.1
 		}
 		route.4 {
-			source eqfir..1
-			sink	multiband_drc..1
+			source eqfir.$index.1
+			sink	multiband_drc.$index.1
 		}
 	}