Merge "audio: update mixer paths" into 24D1-dev

This commit is contained in:
Treehugger Robot 2024-04-09 10:07:15 +00:00 committed by Android (Google) Code Review
commit a70a21d635
3 changed files with 18 additions and 18 deletions

View file

@ -1298,10 +1298,10 @@
<path name="speaker"> <path name="speaker">
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" /> <!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
@ -1310,17 +1310,17 @@
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR --> <!-- load Enable FIR -->
<ctl name="Fast Use Case Delta File" value="fast_switch1.txt" /> <!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<!-- Tx device --> <!-- Tx device -->

View file

@ -1298,10 +1298,10 @@
<path name="speaker"> <path name="speaker">
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" /> <!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
@ -1310,17 +1310,17 @@
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR --> <!-- load Enable FIR -->
<ctl name="Fast Use Case Delta File" value="fast_switch1.txt" /> <!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<!-- Tx device --> <!-- Tx device -->

View file

@ -1298,10 +1298,10 @@
<path name="speaker"> <path name="speaker">
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" /> <!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
@ -1310,17 +1310,17 @@
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR --> <!-- load Enable FIR -->
<ctl name="Fast Use Case Delta File" value="fast_switch1.txt" /> <!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path> </path>
<!-- Tx device --> <!-- Tx device -->