X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=5794b9529a037cef913da03cdd86078cad96ea55;hp=cca203b5d393aa95dc50d0e7df1ffcceb0180420;hb=a55083779b7029a251019b8ef4d053d6eb29220a;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e diff --git a/play.c b/play.c index cca203b5..5794b952 100644 --- a/play.c +++ b/play.c @@ -7,7 +7,6 @@ /** \file play.c Paraslash's standalone player. */ #include -#include #include #include @@ -369,7 +368,13 @@ static int open_new_file(struct play_task *pt) tmp = NULL; } pt->rn.task.pre_select = afh_recv->pre_select; - pt->rn.task.post_select = afh_recv->post_select; + if (afh_recv->new_post_select) { + pt->rn.task.new_post_select = afh_recv->new_post_select; + pt->rn.task.post_select = NULL; + } else { + pt->rn.task.post_select = NULL; + pt->rn.task.new_post_select = afh_recv->new_post_select; + } sprintf(pt->rn.task.status, "%s receiver node", afh_recv->name); return 1; fail: @@ -410,7 +415,13 @@ static int load_file(struct play_task *pt) pt->fn.filter_num = ret; decoder = filters + ret; pt->fn.task.pre_select = decoder->pre_select; - pt->fn.task.post_select = decoder->post_select; + if (decoder->new_post_select) { + pt->fn.task.new_post_select = decoder->new_post_select; + pt->fn.task.post_select = NULL; + } else { + pt->fn.task.new_post_select = NULL; + pt->fn.task.post_select = decoder->post_select; + } sprintf(pt->fn.task.status, "%s decoder", af); pt->fn.btrn = btr_new_node(&(struct btr_node_description) EMBRACE(.name = decoder->name, .parent = pt->rn.btrn, @@ -1255,7 +1266,7 @@ int main(int argc, char *argv[]) filter_init(); writer_init(); - gettimeofday(now, NULL); + clock_get_realtime(now); sched.default_timeout.tv_sec = 5; parse_config_or_die(argc, argv);