]> git.alsa-project.org Git - alsa-utils.git/commit
git://git.alsa-project.org / alsa-utils.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 329cc77) | patch
topology: fix the define section merge from the included files
authorJaroslav Kysela <perex@perex.cz>
Fri, 28 Jan 2022 08:34:06 +0000 (09:34 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 28 Jan 2022 08:45:42 +0000 (09:45 +0100)
commit123eecf7fa1f55b79ffed2d7379e3470870bdee6
tree8c687ce1632a0c07529d04b2d2a39377c096656ctree | snapshot
parent329cc772af09eb984b778f7670ab5a3be70097dbcommit | diff
topology: fix the define section merge from the included files

The bellow commit assumed that the merge of the included file
is to the main configuration tree, but it's for the subtree.
The Define compound from the included file must be handled
separately.

Link: https://github.com/alsa-project/alsa-utils/pull/140
Fixes: e1a0711 ("topology: fix the command line define merge for new includes")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
topology/pre-processor.c diff | blob | history
ALSA utilities repository