aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-12-12 03:22:27 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-12-12 03:22:27 +0000
commit1dc252c920a3ecba088ed55c63e23df2ef415bc1 (patch)
treedfe0cb45a29fbf76c5329e07b512d3345c32e097
parentf628fa1c387cc5679ca08ba66bbc8280bbf6ed6a (diff)
downloadmpd-1dc252c920a3ecba088ed55c63e23df2ef415bc1.tar.gz
mpd-1dc252c920a3ecba088ed55c63e23df2ef415bc1.tar.xz
mpd-1dc252c920a3ecba088ed55c63e23df2ef415bc1.zip
potential fix for bug #466
git-svn-id: https://svn.musicpd.org/mpd/trunk@3726 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_alsa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index e3378143e..c895a9566 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -282,12 +282,6 @@ fail:
return -1;
}
-static void alsa_dropBufferedAudio(AudioOutput * audioOutput) {
- AlsaData * ad = audioOutput->data;
-
- snd_pcm_drop(ad->pcmHandle);
-}
-
inline static int alsa_errorRecovery(AlsaData * ad, int err) {
if(err == -EPIPE) {
DEBUG("Underrun on alsa device \"%s\"\n", ad->device);
@@ -317,6 +311,12 @@ inline static int alsa_errorRecovery(AlsaData * ad, int err) {
return err;
}
+static void alsa_dropBufferedAudio(AudioOutput * audioOutput) {
+ AlsaData * ad = audioOutput->data;
+
+ alsa_errorRecovery( ad, snd_pcm_drop(ad->pcmHandle) );
+}
+
static void alsa_closeDevice(AudioOutput * audioOutput) {
AlsaData * ad = audioOutput->data;