X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=047eeaa348f9017431fc42e5c121ba08f331d3b0;hp=ae3bbfbab60c82ab26311c00b1d0389a7544ec5c;hb=0440ca41086eafb233b5cb516419de830a0bec13;hpb=dd98d31d017bbbe16bf6711e0343b267dd6cfe89

diff --git a/alsa_write.c b/alsa_write.c
index ae3bbfba..047eeaa3 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -14,7 +14,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
 #include <stdbool.h>
@@ -146,7 +145,6 @@ 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;
-	struct timeval tv;
 	snd_pcm_sframes_t avail, underrun;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -172,8 +170,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 	if (underrun < 50)
 		underrun = 50;
 	underrun -= 50;
-	ms2tv(underrun, &tv);
-	sched_request_timeout(&tv, s);
+	sched_request_timeout_ms(underrun, s);
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -214,7 +211,7 @@ again:
 	bytes = btr_next_buffer(btrn, &data);
 	if (ret < 0 || bytes < wn->min_iqs) { /* eof */
 		assert(btr_no_parent(btrn));
-		ret = -E_ALSA_EOF;
+		ret = -E_WRITE_COMMON_EOF;
 		if (!pad)
 			goto err;
 		/* wait until pending frames are played */