summaryrefslogtreecommitdiffstats
path: root/audio/out/ao.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-10-26 15:52:08 +0100
committerwm4 <wm4@nowhere>2015-10-26 15:52:08 +0100
commitec27d573f492f30c1111678273d56f922330fdcd (patch)
tree916878a99712de58e3e012d5536311340de8a97d /audio/out/ao.c
parent72d3c5ef00a71f4620279e0883c86894f145939d (diff)
downloadmpv-ec27d573f492f30c1111678273d56f922330fdcd.tar.bz2
mpv-ec27d573f492f30c1111678273d56f922330fdcd.tar.xz
audio: always log channel maps before determining final map
Until now, this was done only in debug verbosity, while some AOs logged equivalent information in verbose mode. Clean this up.
Diffstat (limited to 'audio/out/ao.c')
-rw-r--r--audio/out/ao.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 6330ec9d48..02dff063ff 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -421,18 +421,11 @@ void ao_hotplug_event(struct ao *ao)
bool ao_chmap_sel_adjust(struct ao *ao, const struct mp_chmap_sel *s,
struct mp_chmap *map)
{
- if (mp_msg_test(ao->log, MSGL_DEBUG)) {
- for (int i = 0; i < s->num_chmaps; i++) {
- struct mp_chmap c = s->chmaps[i];
- MP_DBG(ao, "chmap_sel #%d: %s (%s)\n", i, mp_chmap_to_str(&c),
- mp_chmap_to_str_hr(&c));
- }
- }
+ MP_VERBOSE(ao, "Channel layouts:\n");
+ mp_chmal_sel_log(s, ao->log, MSGL_V);
bool r = mp_chmap_sel_adjust(s, map);
- if (r) {
- MP_DBG(ao, "result: %s (%s)\n", mp_chmap_to_str(map),
- mp_chmap_to_str_hr(map));
- }
+ if (r)
+ MP_VERBOSE(ao, "result: %s\n", mp_chmap_to_str(map));
return r;
}