audio: output human-readable channel layouts too

This gets you the "logical" channel layout, instead of the exact thing
we're sending to the AO. (Tired of the cryptic shit ALSA gives me.)

1 files changed, 2 insertions, 8 deletions

diff --git a/audio/out/ao.c b/audio/out/ao.c
index 4b9b2f9bec..c1333ab584 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -414,20 +414,14 @@ bool ao_chmap_sel_adjust(struct ao *ao, const struct mp_chmap_sel *s,
     if (mp_msg_test(ao->log, MSGL_DEBUG)) {
         for (int i = 0; i < s->num_chmaps; i++) {
             struct mp_chmap c = s->chmaps[i];
-            struct mp_chmap cr = c;
-            mp_chmap_reorder_norm(&cr);
-            mp_chmap_remove_na(&cr);
             MP_DBG(ao, "chmap_sel #%d: %s (%s)\n", i, mp_chmap_to_str(&c),
-                   mp_chmap_to_str(&cr));
+                   mp_chmap_to_str_hr(&c));
         }
     }
     bool r = mp_chmap_sel_adjust(s, map);
     if (r) {
-        struct mp_chmap mapr = *map;
-        mp_chmap_reorder_norm(&mapr);
-        mp_chmap_remove_na(&mapr);
         MP_DBG(ao, "result: %s (%s)\n", mp_chmap_to_str(map),
-               mp_chmap_to_str(&mapr));
+               mp_chmap_to_str_hr(map));
     }
     return r;
 }