Merge branch 't/compress'

[paraslash.git] / play.c

diff --git a/play.c b/play.c
index 50db73a61811f9b4174bb4911537cce9c213113e..2cb0536dfc410eae63c0484ec9bd5535a50fe5ae 100644 (file)
--- a/play.c
+++ b/play.c
@@ -368,13 +368,7 @@ static int open_new_file(struct play_task *pt)
                tmp = NULL;
        }
        pt->rn.task.pre_select = afh_recv->pre_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;
-       }
+       pt->rn.task.post_select = afh_recv->post_select;
        sprintf(pt->rn.task.status, "%s receiver node", afh_recv->name);
        return 1;
 fail:
@@ -415,13 +409,7 @@ static int load_file(struct play_task *pt)
        pt->fn.filter_num = ret;
        decoder = filters + ret;
        pt->fn.task.pre_select = decoder->pre_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;
-       }
+       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,
@@ -1282,8 +1270,7 @@ int main(int argc, char *argv[])
        pt->current_file = conf.inputs_num - 1;
        pt->playing = true;
        pt->task.pre_select = play_pre_select;
-       pt->task.new_post_select = play_post_select;
-       pt->task.post_select = NULL;
+       pt->task.post_select = play_post_select;
        sprintf(pt->task.status, "play task");
        register_task(&sched, &pt->task);
        ret = schedule(&sched);