From: Andre <maan@p133.(none)>
Date: Mon, 5 Jun 2006 19:38:17 +0000 (+0200)
Subject: alsa_writer pre_select: Only set a small timeout if really neccessary.
X-Git-Tag: v0.2.14~79
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=714a9c3600ca1446e18fbce3911ac50e1338ec56;ds=sidebyside

alsa_writer pre_select: Only set a small timeout if really neccessary.
---

diff --git a/alsa_writer.c b/alsa_writer.c
index 466f1e8d..d13ea3a8 100644
--- a/alsa_writer.c
+++ b/alsa_writer.c
@@ -154,14 +154,14 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 	struct timeval diff;
 
 	t->ret = 1;
-	if (*wng->input_eof && *wng->loaded < pad->bytes_per_frame)
+	if (*wng->loaded < pad->bytes_per_frame)
 		return;
 	if (tv_diff(&s->now, &pad->next_chunk, &diff) < 0) {
 		if (tv_diff(&s->timeout, &diff, NULL) > 0)
 			s->timeout = diff;
 	} else {
 		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1000;
+		s->timeout.tv_usec = 1;
 	}
 //	PARA_INFO_LOG("timeout: %lu\n", tv2ms(&s->timeout));
 }
@@ -206,6 +206,7 @@ static void alsa_write_post_select(struct sched *s, struct task *t)
 static void alsa_close(struct writer_node *wn)
 {
 	struct private_alsa_data *pad = wn->private_data;
+	PARA_INFO_LOG("closing writer node %p\n", wn);
 	snd_pcm_drain(pad->handle);
 	snd_pcm_close(pad->handle);
 	snd_config_update_free_global();