From ecc6e379b24dd5e37b864ae599a154880a2bd2d0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 9 May 2013 18:06:26 +0200
Subject: 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.
---
 audio/out/ao_sdl.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'audio/out/ao_sdl.c')

diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index 4235a7c26c..6678cd3bd3 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -160,6 +160,13 @@ static int init(struct ao *ao, char *params)
         return -1;
     }
 
+    struct mp_chmap_sel sel = {0};
+    mp_chmap_sel_add_waveext_def(&sel);
+    if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) {
+        uninit(ao, true);
+        return -1;
+    }
+
     SDL_AudioSpec desired, obtained;
 
     int bytes = 0;
@@ -236,9 +243,12 @@ static int init(struct ao *ao, char *params)
             return -1;
     }
 
+    if (!ao_chmap_sel_get_def(ao, &sel, &ao->channels, obtained.channels)) {
+        uninit(ao, true);
+        return -1;
+    }
+
     ao->samplerate = obtained.freq;
-    mp_chmap_from_channels(&ao->channels, obtained.channels);
-    mp_chmap_reorder_to_alsa(&ao->channels);
     ao->bps = ao->channels.num * ao->samplerate * bytes;
     ao->buffersize = obtained.size * bufcnt;
     ao->outburst = obtained.size;
-- 
cgit v1.2.3