Tools: Topology2: Add switch control to multiband-DRC

This patch provides processing on/off switch to user space. Use e.g. alsamixer to control it. The control names are shortened to see bytes and switch string ends. Signed-off-by: Seppo Ingalsuo <[email protected]>
thesofproject · Aug 22, 2023 · 8982a62 · 8982a62
1 parent ff94121
commit 8982a62
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
@@ -59,8 +59,14 @@ Object.Pipeline {
 				}
 			}
 			Object.Widget.multiband_drc.1 {
-				Object.Control.bytes."1" {
-					name 'Post Mixer $ANALOG_PLAYBACK_PCM Multiband-DRC'
+				Object.Control {
+					bytes."1" {
+						name 'Post Mixer $ANALOG_PLAYBACK_PCM MBDRC bytes'
+					}
+					mixer."1" {
+						name 'Post Mixer $ANALOG_PLAYBACK_PCM MBDRC switch'
+						max 1
+					}
 				}
 			}
 		}

diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf
@@ -22,6 +22,7 @@
 <include/components/mixout.conf>
 <include/components/pipeline.conf>
 <include/controls/bytes.conf>
+<include/controls/mixer.conf>
 <include/components/eqiir.conf>
 <include/components/eqfir.conf>
 <include/components/drc.conf>
@@ -155,10 +156,27 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" {
 				out_valid_bit_depth	32
 			}
 
-			Object.Control.bytes."1" {
-				IncludeByKey.EFX_MULTIBAND_DRC_PARAMS {
-					"passthrough"	"include/components/multiband_drc/passthrough.conf"
-					"default"	"include/components/multiband_drc/default.conf"
+			Object.Control {
+				bytes."1" {
+					IncludeByKey.EFX_MULTIBAND_DRC_PARAMS {
+						"passthrough"	"include/components/multiband_drc/passthrough.conf"
+						"default"	"include/components/multiband_drc/default.conf"
+					}
+				}
+
+				mixer."1" {
+					Object.Base.channel.1 {
+						name    "fc"
+						shift	0
+					}
+					Object.Base.ops.1 {
+						name	"ctl"
+						info	"volsw"
+						#259 binds the mixer control to switch get/put handlers
+						get	259
+						put	259
+					}
+					max 1
 				}
 			}
 		}