X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=3c8d063fdd323f304db237c5ad72349f7df33c45;hp=7362c42bdaefe57ae485fa7ec202212eaa6cfa12;hb=3741aebd97c1b370f4e783dd6d82dd9e690195a8;hpb=7041d795b5af3661daf332ef13c50517b5b9716b

diff --git a/alsa_write.c b/alsa_write.c
index 7362c42b..3c8d063f 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -54,6 +54,7 @@ struct private_alsa_write_data {
 	 * decoder of the writer node group.
 	 */
 	unsigned channels;
+	struct timeval drain_barrier;
 };
 
 /* Install PCM software and hardware configuration. */
@@ -136,7 +137,7 @@ static int alsa_open(struct writer_node *wn)
 	return 1;
 }
 
-static void alsa_write_pre_select_btr(struct sched *s, struct task *t)
+static void alsa_write_pre_select(struct sched *s, struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
 	struct private_alsa_write_data *pad = wn->private_data;
@@ -209,7 +210,7 @@ static void alsa_close(struct writer_node *wn)
 	free(pad);
 }
 
-static void alsa_write_post_select_btr(__a_unused struct sched *s,
+static void alsa_write_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -217,7 +218,7 @@ static void alsa_write_post_select_btr(__a_unused struct sched *s,
 	struct btr_node *btrn = wn->btrn;
 	char *data;
 	size_t bytes;
-	snd_pcm_sframes_t frames, avail;
+	snd_pcm_sframes_t frames;
 	int ret;
 
 again:
@@ -233,10 +234,14 @@ again:
 		if (!pad->handle)
 			goto err;
 		/* wait until pending frames are played */
-		avail = snd_pcm_avail_update(pad->handle);
-		if (avail + 1000 > pad->buffer_frames)
+		if (pad->drain_barrier.tv_sec == 0) {
+			PARA_DEBUG_LOG("waiting for device to drain\n");
+			tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
+				&pad->drain_barrier);
+			return;
+		}
+		if (tv_diff(now, &pad->drain_barrier, NULL) > 0)
 			goto err;
-		PARA_DEBUG_LOG("waiting for device to drain\n");
 		return;
 	}
 	if (!pad->handle) {
@@ -319,8 +324,8 @@ void alsa_write_init(struct writer *w)
 	alsa_cmdline_parser_init(&dummy);
 	w->open = alsa_open;
 	w->close = alsa_close;
-	w->pre_select_btr = alsa_write_pre_select_btr;
-	w->post_select_btr = alsa_write_post_select_btr;
+	w->pre_select = alsa_write_pre_select;
+	w->post_select = alsa_write_post_select;
 	w->parse_config = alsa_parse_config;
 	w->shutdown = NULL; /* nothing to do */
 	w->free_config = alsa_free_config;