audio/out: channel map selection

Make all AOs use what has been introduced in the previous commit.

Note that even AOs which can handle all possible layouts (like ao_null)
use the new functions. This might be important if in the future
ao_select_champ() possibly honors global user options about downmixing
and so on.

1 files changed, 4 insertions, 1 deletions

diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 1199ab5a90..903e89bc8b 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -146,7 +146,10 @@ static int init(struct ao *ao, char *params)
         }
     }
 
-    mp_chmap_reorder_to_waveext(&ao->channels);
+    struct mp_chmap_sel sel = {0};
+    mp_chmap_sel_add_waveext(&sel);
+    if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels))
+        return -1;
 
     ao->outburst = 65536;
     ao->bps = ao->channels.num * ao->samplerate * (af_fmt2bits(ao->format) / 8);