alsa_plugin.c: workaround snd_pcm_drain bug

Reintroduce a fix from commit 52a06531 (Warren Dukes): "don't call snd_pcm_drain unless we're already in the RUNNING state". This prevents ALSA with dmix from sometimes hanging when snd_pcm_drain is called, e.g. when moving from one song to the next (as in mantis issue 2634).

alsa_plugin.c: workaround snd_pcm_drain bug
4dc25d39 · Jeffrey Middleton · 0f9f82f2 · 4dc25d39
Commit 4dc25d39 authored Nov 02, 2009 by Jeffrey Middleton
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

alsa_plugin.c src/output/alsa_plugin.c +2 -1

No files found.
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -500,7 +500,8 @@ alsa_drain(void *data)
 {
 	struct alsa_data *ad = data;
-	snd_pcm_drain(ad->pcm);
+	if (snd_pcm_state(ad->pcm) == SND_PCM_STATE_RUNNING)
+		snd_pcm_drain(ad->pcm);
 }
 static void