Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 913aac34 authored by Zhou Song's avatar Zhou Song
Browse files

configs: lahaina: fix audio not heard over speaker for haptics 

For parsing paths in xml file, libaudioroute will break if
a duplicated ctl is found, this can cause the ctl of audio over
speaker skipped, so for combo device usecases, audio will be
lost on speaker.
Fix it by removing nested path, replace with single mixer ctl
for combo device usecases.

Change-Id: Ibe74ed8ed28b3a5534b8b44edd211b5bb6bb8583
parent 132fe634

configs/lahaina/mixer_paths.xml

+13 −13
Original line number Diff line number Diff line
@@ -2417,12 +2417,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-display-port">

        <path name="audio-with-haptics-playback display-port" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2442,12 +2442,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2461,37 +2461,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">

        <path name="audio-with-haptics-playback bt-sco-swb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2501,12 +2501,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_cdp.xml

+13 −13
Original line number Diff line number Diff line
@@ -2256,12 +2256,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-display-port">

        <path name="audio-with-haptics-playback display-port" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2281,12 +2281,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2300,37 +2300,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">

        <path name="audio-with-haptics-playback bt-sco-swb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2340,12 +2340,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_qrd.xml

+13 −13
Original line number Diff line number Diff line
@@ -2409,12 +2409,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-display-port">

        <path name="audio-with-haptics-playback display-port" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2434,12 +2434,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2453,37 +2453,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">

        <path name="audio-with-haptics-playback bt-sco-swb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2493,12 +2493,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_shimaidp.xml

+13 −13
Original line number Diff line number Diff line
@@ -2361,12 +2361,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-display-port">

        <path name="audio-with-haptics-playback display-port" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2386,12 +2386,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2405,37 +2405,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">

        <path name="audio-with-haptics-playback bt-sco-swb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2445,12 +2445,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_shimaidps.xml

+13 −13
Original line number Diff line number Diff line
@@ -2221,12 +2221,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-display-port">

        <path name="audio-with-haptics-playback display-port" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2246,12 +2246,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2265,37 +2265,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

        <path name="audio-with-haptics-playback bt-sco" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-swb">

        <path name="audio-with-haptics-playback bt-sco-swb" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2305,12 +2305,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />

    </path>



    <!-- These are actual sound device specific mixer settings -->