X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=7fea2dfccd978c001148e2721273114f7349d4c9;hp=adfe9de9ee52c0156de5136bbb10870b5ec5aae3;hb=810761a3cdf3f75dd8e07a5d903793048c36df1d;hpb=5cf6f5f9fbef995c60a9a2e95bd049a0ee256404

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index adfe9de9..7fea2dfc 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -29,52 +29,6 @@ struct private_prebuffer_data {
 	struct timeval barrier;
 };
 
-static ssize_t prebuffer_convert(char *inbuf, size_t inbuf_len,
-		struct filter_node *fn)
-{
-	struct private_prebuffer_data *ppd = fn->private_data;
-	struct prebuffer_filter_args_info *conf = ppd->conf;
-
-	if (inbuf_len == 0) {
-		if (*fn->fc->input_error < 0 && ppd->prebuffered >= 0)
-			goto prebuffer_end;
-		return 0;
-	}
-	if (ppd->prebuffered < 0) {
-		size_t copy = PARA_MIN(inbuf_len, fn->bufsize - fn->loaded);
-		memcpy(fn->buf + fn->loaded, inbuf, copy);
-		fn->loaded += copy;
-		return copy;
-	}
-	if (ppd->prebuffered + inbuf_len > fn->bufsize) {
-		fn->bufsize = PARA_MAX(2 * fn->bufsize,
-			ppd->prebuffered + inbuf_len);
-		fn->buf = para_realloc(fn->buf, fn->bufsize);
-	}
-	memcpy(fn->buf + ppd->prebuffered, inbuf, inbuf_len);
-	if (ppd->prebuffered == 0) {
-		struct timeval tv;
-		PARA_INFO_LOG("prebuffer period %dms\n",
-			conf->duration_arg);
-		ms2tv(conf->duration_arg, &tv);
-		tv_add(&tv, now, &ppd->barrier);
-	}
-	ppd->prebuffered += inbuf_len;
-	PARA_DEBUG_LOG("%d bytes prebuffered\n", ppd->prebuffered);
-	if (*fn->fc->input_error >= 0) {
-		struct timeval diff;
-		if (tv_diff(now, &ppd->barrier, &diff) < 0)
-			goto out;
-		if (ppd->prebuffered < conf->size_arg)
-			goto out;
-	}
-prebuffer_end:
-	fn->loaded = ppd->prebuffered;
-	ppd->prebuffered = -1;
-out:
-	return inbuf_len;
-}
-
 static void prebuffer_pre_select(struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
@@ -95,13 +49,8 @@ static void prebuffer_pre_select(struct sched *s, struct task *t)
 		tv_add(&tv, now, &ppd->barrier);
 	}
 	if (tv_diff(&ppd->barrier, now, &diff) < 0)
-		goto min_delay;
-	if (tv_diff(&diff, &s->timeout, NULL) < 0)
-		s->timeout = diff;
-	return;
-min_delay:
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
+		return sched_min_delay(s);
+	sched_request_timeout(&diff, s);
 }
 
 static void prebuffer_close(struct filter_node *fn)
@@ -162,6 +111,11 @@ static void prebuffer_open(struct filter_node *fn)
 	fn->buf = para_malloc(fn->bufsize);
 }
 
+static void prebuffer_free_config(void *conf)
+{
+	prebuffer_cmdline_parser_free(conf);
+}
+
 /**
  * The init function of the prebuffer filter.
  *
@@ -174,8 +128,8 @@ void prebuffer_filter_init(struct filter *f)
 	prebuffer_cmdline_parser_init(&dummy);
 	f->open = prebuffer_open;
 	f->close = prebuffer_close;
-	f->convert = prebuffer_convert;
 	f->parse_config = prebuffer_parse_config;
+	f->free_config = prebuffer_free_config;
 	f->pre_select = prebuffer_pre_select;
 	f->post_select = prebuffer_post_select;
 	f->help = (struct ggo_help) {