Skip to content

topology: fix conflict PIPE_VOLUME_PLAYBACK defination #2827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Apr 21, 2020
Merged

topology: fix conflict PIPE_VOLUME_PLAYBACK defination #2827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/topology/sof-hda-generic.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ include(`platform/intel/intel-generic-dmic.m4')

# The pipeline naming notation is pipe-PROCESSING-DIRECTION.m4
# PPROC is set by makefile
define(PIPE_VOLUME_PLAYBACK, `sof/pipe-`PPROC'-playback.m4')
define(PIPE_HEADSET_PLAYBACK, `sof/pipe-`PPROC'-playback.m4')
Comment thread
xiulipan marked this conversation as resolved.
Resolved

#
# Define the pipelines
Expand All @@ -46,7 +46,7 @@ define(PIPE_VOLUME_PLAYBACK, `sof/pipe-`PPROC'-playback.m4')

# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s24le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(PIPE_VOLUME_PLAYBACK,
PIPELINE_PCM_ADD(PIPE_HEADSET_PLAYBACK,
1, 0, 2, s24le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down