Skip to content

Commit

Permalink
topology2: sdw-jack-generic.conf: Rename mixers
Browse files Browse the repository at this point in the history
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. Adds a define
for the capture PCM too. 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:
'1 Playback Volume 0' -> 'Pre Mixer Jack Out Playback Volume'
'2 Main Playback Volume' -> 'Post Mixer Jack Out Playback Volume'

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
  • Loading branch information
Jyri Sarha authored and kv2019i committed Jun 28, 2023
1 parent 2af9143 commit a3814c5
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions tools/topology/topology2/platform/intel/sdw-jack-generic.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ IncludeByKey.PASSTHROUGH {
}
}

Define {
JACK_PLAYBACK_PCM_NAME "Jack Out"
JACK_CAPTURE_PCM_NAME "Jack In"
}

#
# List of all DAIs
#
Expand Down Expand Up @@ -57,7 +62,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 Playback Volume 0'
name 'Pre Mixer $JACK_PLAYBACK_PCM_NAME Playback Volume'
}
}
}
Expand All @@ -73,7 +78,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '2 Main Playback Volume'
name 'Post Mixer $JACK_PLAYBACK_PCM_NAME Playback Volume'
}
}
}
Expand Down Expand Up @@ -292,11 +297,11 @@ IncludeByKey.PASSTHROUGH {

Object.PCM.pcm [
{
name "Jack out"
name "$JACK_PLAYBACK_PCM_NAME"
id 0
direction "playback"
Object.Base.fe_dai.1 {
name "Jack out"
name "$JACK_PLAYBACK_PCM_NAME"
}

Object.PCM.pcm_caps.1 {
Expand All @@ -305,11 +310,11 @@ Object.PCM.pcm [
}
}
{
name "Jack in"
name "$JACK_CAPTURE_PCM_NAME"
id 1
direction "capture"
Object.Base.fe_dai.1 {
name "Jack in"
name "$JACK_CAPTURE_PCM_NAME"
}

Object.PCM.pcm_caps.1 {
Expand Down

0 comments on commit a3814c5

Please sign in to comment.