From aea2328906fc754c0d0cdea57c60d71522ae99a5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Apr 2013 23:06:22 +0200
Subject: audio/out: switch to channel map

This actually breaks audio for 5/6/8 channels. There's no reordering
done yet. The actual reordering will be done inside of af_lavrresample
and has to be made part of the format negotiation.
---
 audio/out/ao_jack.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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

diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index b75122dc17..aea64ee02c 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -202,7 +202,8 @@ static void print_help (void)
          );
 }
 
-static int init(int rate, int channels, int format, int flags) {
+static int init(int rate, const struct mp_chmap *channels, int format, int flags)
+{
   const char **matching_ports = NULL;
   char *port_name = NULL;
   char *client_name = NULL;
@@ -222,8 +223,9 @@ static int init(int rate, int channels, int format, int flags) {
     print_help();
     return 0;
   }
-  if (channels > MAX_CHANS) {
-    mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] Invalid number of channels: %i\n", channels);
+  if (ao_data.channels.num > MAX_CHANS) {
+    mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] Invalid number of channels: %i\n",
+           ao_data.channels.num);
     goto err_out;
   }
   if (!client_name) {
@@ -249,9 +251,9 @@ static int init(int rate, int channels, int format, int flags) {
     goto err_out;
   }
   i = 1;
+  num_ports = ao_data.channels.num;
   while (matching_ports[i]) i++;
-  if (channels > i) channels = i;
-  num_ports = channels;
+  if (num_ports > i) num_ports = i;
 
   // create out output ports
   for (i = 0; i < num_ports; i++) {
@@ -281,10 +283,11 @@ static int init(int rate, int channels, int format, int flags) {
                  / (float)rate;
   callback_interval = 0;
 
-  ao_data.channels = channels;
+  mp_chmap_from_channels(&ao_data.channels, num_ports);
+  mp_chmap_reorder_to_alsa(&ao_data.channels); // what order does hack use?
   ao_data.samplerate = rate;
   ao_data.format = AF_FORMAT_FLOAT_NE;
-  ao_data.bps = channels * rate * sizeof(float);
+  ao_data.bps = ao_data.channels.num * rate * sizeof(float);
   ao_data.buffersize = CHUNK_SIZE * NUM_CHUNKS;
   ao_data.outburst = CHUNK_SIZE;
   free(matching_ports);
-- 
cgit v1.2.3