audio: don't reset mixer paths at standby
It's not necessary to reset the mixer paths at standby,
and doing so can cause pops and clicks when the output
path is changed.
In addition, use a more direct path for the headphone
output (avoiding the analogue mixer).
Bug: 7302620
Change-Id: I1741304f65f5c0e05d33eeefdbb3446f4d94119f
diff --git a/mixer_paths.xml b/mixer_paths.xml
index 14a3173..a8b53a9 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -13,8 +13,8 @@
<ctl name="Speaker Mixer Volume" value="0" />
<ctl name="Headphone Switch" value="0" />
- <ctl name="Right Headphone Mux" value="Mixer" />
- <ctl name="Left Headphone Mux" value="Mixer" />
+ <ctl name="Right Headphone Mux" value="DAC" />
+ <ctl name="Left Headphone Mux" value="DAC" />
<ctl name="Left Output Mixer DAC Switch" value="0" />
<ctl name="Right Output Mixer DAC Switch" value="0" />
@@ -79,8 +79,6 @@
<path name="headphones">
<path name="dac1" />
<ctl name="Headphone Switch" value="1" />
- <ctl name="Left Output Mixer DAC Switch" value="1" />
- <ctl name="Right Output Mixer DAC Switch" value="1" />
<path name="eq-headphone" />
</path>
@@ -188,8 +186,6 @@
<path name="speaker-and-headphones">
<path name="dac1" />
<ctl name="Headphone Switch" value="1" />
- <ctl name="Left Output Mixer DAC Switch" value="1" />
- <ctl name="Right Output Mixer DAC Switch" value="1" />
<ctl name="Speaker Switch" value="1" />
<ctl name="SPKR DAC1 Switch" value="1" />
<ctl name="SPKL DAC1 Switch" value="1" />