diff options
author | wm4 <wm4@nowhere> | 2015-06-25 19:10:24 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-06-25 19:10:24 +0200 |
commit | 5a3cdb8f1e8b14daf11d44ef729a2484982b7305 (patch) | |
tree | 57369f90adb2e163dffc86b2649e7ba1d0f08077 /audio/out/ao.c | |
parent | fd1194de3c4b14126269f2db918c0f8bcf2bf34a (diff) | |
download | mpv-5a3cdb8f1e8b14daf11d44ef729a2484982b7305.tar.bz2 mpv-5a3cdb8f1e8b14daf11d44ef729a2484982b7305.tar.xz |
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.)
Diffstat (limited to 'audio/out/ao.c')
-rw-r--r-- | audio/out/ao.c | 10 |
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; } |