X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=alsa_write.c;h=e1c5ce312e6ce8f6af6d81c9070b5899e40f1398;hb=cc2a6158eef6957769fd5739446916d3e5413ae1;hp=f8c192b7df7daf3fc6283854e885da8a33e52f32;hpb=c6675d53d29b87bf0ac4c713edbaae630611048e;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index f8c192b7..e1c5ce31 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -25,10 +25,10 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "write.h"
 #include "alsa_write.cmdline.h"
 #include "error.h"
-#include "buffer_tree.h"
 
 /** always use 16 bit little endian */
 #define FORMAT SND_PCM_FORMAT_S16_LE
@@ -315,6 +315,19 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 	return -E_ALSA_WRITE;
 }
 
+static void alsa_close(struct writer_node *wn)
+{
+	struct private_alsa_write_data *pad = wn->private_data;
+	PARA_INFO_LOG("closing writer node %p\n", wn);
+
+	if (pad->handle) {
+		snd_pcm_drain(pad->handle);
+		snd_pcm_close(pad->handle);
+		snd_config_update_free_global();
+	}
+	free(pad);
+}
+
 static void alsa_write_post_select_btr(__a_unused struct sched *s,
 		struct task *t)
 {
@@ -372,24 +385,12 @@ again:
 	ret = -E_ALSA_WRITE;
 err:
 	assert(ret < 0);
+	alsa_close(wn);
 	btr_del_node(wn->btrn);
 	wn->btrn = NULL;
 	t->error = ret;
 }
 
-static void alsa_close(struct writer_node *wn)
-{
-	struct private_alsa_write_data *pad = wn->private_data;
-	PARA_INFO_LOG("closing writer node %p\n", wn);
-
-	if (pad->handle) {
-		snd_pcm_drain(pad->handle);
-		snd_pcm_close(pad->handle);
-		snd_config_update_free_global();
-	}
-	free(pad);
-}
-
 __malloc static void *alsa_parse_config(const char *options)
 {
 	int ret;