mirror of https://github.com/thesofproject/sof.git
topology2: cavs-sdw-src-gain-mixin.conf: Rename mixers
Rename mixers according to the new naming convention by referring to the associated PCM name and the position in the topology. Create defines for PCM names so the name is only in one place. The commit also updates the PCM names while adding the defines. This produces following changes, on PCM names: 'Jack in' -> 'Jack In' 'Jack Out' -> 'Jack Out' and on mixer names: 'Src Playback Volume' -> 'Pre Mixer Jack Out Playback Volume' 'Main Playback Volume' -> 'Post Mixer Jack Out Playback Volume' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
This commit is contained in:
parent
bda1bcd5bc
commit
2af91434b5
|
@ -33,6 +33,8 @@ Define {
|
|||
SDW_CAPTURE_PCM 'SDW0-Capture'
|
||||
PLAYBACK_LINK_ID 0
|
||||
CAPTURE_LINK_ID 1
|
||||
JACK_OUT_PCM_NAME "Jack Out"
|
||||
JACK_IN_PCM_NAME "Jack In"
|
||||
}
|
||||
|
||||
#
|
||||
|
@ -86,7 +88,7 @@ Object.Pipeline {
|
|||
}
|
||||
Object.Widget.gain.1{
|
||||
Object.Control.mixer.1 {
|
||||
name 'Src Playback Volume'
|
||||
name 'Pre Mixer $JACK_OUT_PCM_NAME Playback Volume'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -105,7 +107,7 @@ Object.Pipeline {
|
|||
|
||||
Object.Widget.gain.1 {
|
||||
Object.Control.mixer.1 {
|
||||
name 'Main Playback Volume'
|
||||
name 'Post Mixer $JACK_OUT_PCM_NAME Playback Volume'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -168,11 +170,11 @@ Object.Widget {
|
|||
|
||||
Object.PCM.pcm [
|
||||
{
|
||||
name "Jack out"
|
||||
name "$JACK_OUT_PCM_NAME"
|
||||
id 0
|
||||
direction "playback"
|
||||
Object.Base.fe_dai.1 {
|
||||
name "Jack out"
|
||||
name "$JACK_OUT_PCM_NAME"
|
||||
}
|
||||
|
||||
Object.PCM.pcm_caps.1 {
|
||||
|
@ -183,11 +185,11 @@ Object.PCM.pcm [
|
|||
}
|
||||
}
|
||||
{
|
||||
name "Jack in"
|
||||
name "$JACK_IN_PCM_NAME"
|
||||
id 1
|
||||
direction "capture"
|
||||
Object.Base.fe_dai.1 {
|
||||
name "Jack in"
|
||||
name "$JACK_IN_PCM_NAME"
|
||||
}
|
||||
|
||||
Object.PCM.pcm_caps.1 {
|
||||
|
|
Loading…
Reference in New Issue