summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-29 18:49:11 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:16 +0900
commitccf8c42a424cce84a15fba72baf482f84d9bc628 (patch)
tree1e7623a5fdcdd3d151ce651df705eeb6cb7b244f
parent4759f61e73a5ad2880394c7a5023179aa25d4a0a (diff)
downloadmpv-ccf8c42a424cce84a15fba72baf482f84d9bc628.tar.bz2
mpv-ccf8c42a424cce84a15fba72baf482f84d9bc628.tar.xz
ao_alsa: print channel map if setting it fails
This message is printed when the audio device advertised a channel map, but couldn't set it - which is probably a dmix bug (we'll never know, ALSA doesn't take bug reports). Print the requested map, so that the user (maybe) can make a connection when seeing the message and the actually used channel map, which might be less confusing. Or at least less useless.
-rw-r--r--audio/out/ao_alsa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 651efb6a3a..a828bcd96b 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -608,7 +608,8 @@ static int init(struct ao *ao)
err = snd_pcm_set_chmap(p->alsa, alsa_chmap);
if (err == -ENXIO) {
- MP_WARN(ao, "Device does not support requested channel map\n");
+ MP_WARN(ao, "Device does not support requested channel map (%s)\n",
+ mp_chmap_to_str(&dev_chmap));
} else {
CHECK_ALSA_WARN("Channel map setup failed");
}