X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=03705089ff528f37aaf31a26ddf604ad884b1862;hp=4fc04b5120829d057617d68d7854453c2612c6cc;hb=3f1510c31beb5c053d2f6c510f04a1e7466fce65;hpb=8fa50e3e39b4f65dea2a694dc064038a41036642

diff --git a/audiod.c b/audiod.c
index 4fc04b51..03705089 100644
--- a/audiod.c
+++ b/audiod.c
@@ -440,21 +440,7 @@ static void close_filters(struct slot_info *s)
 	s->fns = NULL;
 }
 
-/*
- * Whenever a task commits suicide by returning from post_select with t->error
- * < 0, it also removes its btr node. We do exactly that to kill a running
- * task. Note that the scheduler checks t->error also _before_ each pre/post
- * select call, so the victim will never be scheduled again.
- */
-static void kill_btrn(struct btr_node **btrnp, struct task *t, int error)
-{
-	if (t->error < 0)
-		return;
-	t->error = error;
-	btr_remove_node(btrnp);
-}
-
-static void kill_all_decoders(int error)
+static void notify_receivers(int error)
 {
 	int i;
 
@@ -464,8 +450,7 @@ static void kill_all_decoders(int error)
 			continue;
 		if (!s->receiver_node)
 			continue;
-		kill_btrn(&s->receiver_node->btrn, &s->receiver_node->task,
-				error);
+		task_notify(&s->receiver_node->task, error);
 	}
 }
 
@@ -1144,7 +1129,7 @@ static void start_stop_decoders(void)
 		try_to_close_slot(i);
 	if (audiod_status != AUDIOD_ON ||
 			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
-		return kill_all_decoders(-E_NOT_PLAYING);
+		return notify_receivers(E_NOT_PLAYING);
 	if (!must_start_decoder())
 		return;
 	ret = open_receiver(stat_task->current_audio_format_num);
@@ -1198,7 +1183,7 @@ static void status_post_select(struct sched *s, struct task *t)
 		if (!st->ct)
 			goto out;
 		if (st->ct->task.error >= 0) {
-			kill_btrn(&st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
+			task_notify(&st->ct->task, E_AUDIOD_OFF);
 			goto out;
 		}
 		close_stat_pipe();
@@ -1220,15 +1205,14 @@ static void status_post_select(struct sched *s, struct task *t)
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
 			if (diff.tv_sec > 61)
-				kill_btrn(&st->ct->btrn, &st->ct->task,
-					-E_STATUS_TIMEOUT);
+				task_notify(&st->ct->task, E_AUDIOD_OFF);
 			goto out;
 		}
 		btr_merge(st->btrn, st->min_iqs);
 		sz = btr_next_buffer(st->btrn, &buf);
 		ret = for_each_stat_item(buf, sz, update_item);
 		if (ret < 0) {
-			kill_btrn(&st->ct->btrn, &st->ct->task, ret);
+			task_notify(&st->ct->task, E_AUDIOD_OFF);
 			goto out;
 		}
 		if (sz != ret) {