X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_writer.c;h=da02ac28a5f7e2e84b94d29900b793c611963b5c;hp=d13ea3a8b2ec71eaf85310603d437f60b9a39e15;hb=5124ade7db7ee2eef8a8a6acae2a398d82a666cc;hpb=714a9c3600ca1446e18fbce3911ac50e1338ec56

diff --git a/alsa_writer.c b/alsa_writer.c
index d13ea3a8..da02ac28 100644
--- a/alsa_writer.c
+++ b/alsa_writer.c
@@ -146,16 +146,15 @@ static int alsa_open(struct writer_node *w)
 		PARA_ERROR_LOG("%s\n", "failed to set nonblock mode");
 	return period_size * pad->bytes_per_frame;
 }
-static void alsa_write_pre_select(struct sched *s, struct task *t)
+
+static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 {
-	struct writer_node *wn = t->private_data;
 	struct private_alsa_data *pad = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
 	struct timeval diff;
 
-	t->ret = 1;
 	if (*wng->loaded < pad->bytes_per_frame)
-		return;
+		return 1;
 	if (tv_diff(&s->now, &pad->next_chunk, &diff) < 0) {
 		if (tv_diff(&s->timeout, &diff, NULL) > 0)
 			s->timeout = diff;
@@ -163,44 +162,42 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 		s->timeout.tv_sec = 0;
 		s->timeout.tv_usec = 1;
 	}
+	return 1;
 //	PARA_INFO_LOG("timeout: %lu\n", tv2ms(&s->timeout));
 }
 
-static void alsa_write_post_select(struct sched *s, struct task *t)
+static int alsa_write_post_select(struct sched *s, struct writer_node *wn)
 {
-	struct writer_node *wn = t->private_data;
 	struct private_alsa_data *pad = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
-	size_t frames = *wng->loaded / pad->bytes_per_frame;
+	size_t frames = (*wng->loaded - wn->written) / pad->bytes_per_frame;
 	snd_pcm_sframes_t ret;
-	unsigned char *data = (unsigned char*)wng->buf;
+	unsigned char *data = (unsigned char*)wng->buf + wn->written;
 	struct timeval tv;
 
-	t->ret = 0;
 //	PARA_INFO_LOG("%zd frames\n", frames);
 	if (!frames) {
 		if (*wng->input_eof)
-			t->ret = *wng->loaded;
-		return;
+			wn->written = *wng->loaded;
+		return 1;
 	}
 	if (tv_diff(&s->now, &pad->next_chunk, NULL) < 0)
-		return;
+		return 1;
 	ret = snd_pcm_writei(pad->handle, data, frames);
 	if (ret == -EPIPE) {
 		PARA_WARNING_LOG("%s", "EPIPE\n");
 		snd_pcm_prepare(pad->handle);
-		return;
+		return 1;
 	}
 	if (ret < 0) {
 		PARA_WARNING_LOG("%s", "ALSA ERROR\n");
-		t->ret = -E_ALSA_WRITE;
-		return;
+		return -E_ALSA_WRITE;
 	}
 	ms2tv(pad->buffer_time / 4000, &tv);
 //	ms2tv(1, &tv);
 	tv_add(&s->now, &tv, &pad->next_chunk);
-	t->ret = ret * pad->bytes_per_frame;
-//	PARA_INFO_LOG("ret: %d, frames: %zd\n", t->ret, frames);
+	wn->written += ret * pad->bytes_per_frame;
+	return 1;
 }
 
 static void alsa_close(struct writer_node *wn)