update master

This commit is contained in:
Chengyi Zhao 2024-06-25 16:53:15 +08:00
commit 7138fa0272
227 changed files with 67492 additions and 3107 deletions

View file

@ -39,7 +39,11 @@ channel-map = aux0,aux1,left,right,aux2,aux3
direction = output
[Mapping stereo-out-ef]
<<<<<<< HEAD
description = Analog Stereo 5/6
=======
description = Stereo 5/6 (S/PDIF)
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
device-strings = hw:%f,0,0
channel-map = aux0,aux1,aux2,aux3,left,right
direction = output
@ -51,7 +55,11 @@ channel-map = mono,aux0,aux1,aux2,aux3,aux4
direction = input
[Mapping analog-mono-in-b]
<<<<<<< HEAD
description = Anlog Mono Input 2
=======
description = Analog Mono Input 2
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
device-strings = hw:%f,0,0
channel-map = aux0,mono,aux1,aux2,aux3,aux4
direction = input
@ -69,7 +77,11 @@ channel-map = aux0,aux1,left,right,aux2,aux3
direction = input
[Mapping stereo-in-ef]
<<<<<<< HEAD
description = Stereo Input 5/6
=======
description = Stereo Input 5/6 (S/PDIF)
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
device-strings = hw:%f,0,0
channel-map = aux0,aux1,aux2,aux3,left,right
direction = input