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, 7 insertions, 1 deletions

diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 80dfa4dc2b..78ea2c63f5 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -121,7 +121,13 @@ static int init(struct ao *ao, char *params)
         free(port);
     }
 
-    mp_chmap_reorder_to_alsa(&ao->channels);
+    // Actual channel layout unknown.
+    struct mp_chmap_sel sel = {0};
+    mp_chmap_sel_add_waveext_def(&sel);
+    if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) {
+        rsd_free(priv->rd);
+        return -1;
+    }
 
     rsd_set_param(priv->rd, RSD_SAMPLERATE, &ao->samplerate);
     rsd_set_param(priv->rd, RSD_CHANNELS, &ao->channels.num);