X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=311462e6dad0a69dff85ceb6338930271aaa6b59;hb=e3a7e12639c34fd86d48a072beb48add8c498d09;hp=1dc70e5e3fa0dc107920de755a1b6f99b35f31a1;hpb=742c8b3f79a59278ced71e1855da1846b157b494;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 1dc70e5e..311462e6 100644
--- a/audiod.c
+++ b/audiod.c
@@ -584,8 +584,8 @@ static void open_filters(struct slot_info *s)
 		sprintf(buf, "%s (slot %d)", name, (int)(s - slot));
 		fn->task = task_register(&(struct task_info) {
 			.name = buf,
-			.pre_select = f->pre_select,
-			.post_select = f->post_select,
+			.pre_monitor = f->pre_monitor,
+			.post_monitor = f->post_monitor,
 			.context = fn,
 		}, &sched);
 		parent = fn->btrn;
@@ -648,8 +648,8 @@ static int open_receiver(int format)
 		audio_formats[format], name, slot_num);
 	rn->task = task_register(&(struct task_info) {
 		.name = name,
-		.pre_select = r->pre_select,
-		.post_select = r->post_select,
+		.pre_monitor = r->pre_monitor,
+		.post_monitor = r->post_monitor,
 		.context = rn,
 	}, &sched);
 	return slot_num;
@@ -1055,7 +1055,7 @@ static void init_local_socket(struct command_task *ct)
 	exit(EXIT_FAILURE);
 }
 
-static int signal_post_select(struct sched *s, void *context)
+static int signal_post_monitor(struct sched *s, void *context)
 {
 	struct signal_task *st = context;
 	int ret, signum;
@@ -1075,13 +1075,13 @@ static int signal_post_select(struct sched *s, void *context)
 	return 0;
 }
 
-static void command_pre_select(struct sched *s, void *context)
+static void command_pre_monitor(struct sched *s, void *context)
 {
 	struct command_task *ct = context;
 	sched_monitor_readfd(ct->fd, s);
 }
 
-static int command_post_select(struct sched *s, void *context)
+static int command_post_monitor(struct sched *s, void *context)
 {
 	int ret;
 	struct command_task *ct = context;
@@ -1132,8 +1132,8 @@ static void init_command_task(struct command_task *ct)
 
 	ct->task = task_register(&(struct task_info) {
 		.name = "command",
-		.pre_select = command_pre_select,
-		.post_select = command_post_select,
+		.pre_monitor = command_pre_monitor,
+		.post_monitor = command_post_monitor,
 		.context = ct,
 	}, &sched);
 }
@@ -1254,7 +1254,7 @@ static void start_stop_decoders(void)
 	audiod_status_dump(true);
 }
 
-static void status_pre_select(struct sched *s, void *context)
+static void status_pre_monitor(struct sched *s, void *context)
 {
 	struct status_task *st = context;
 	int i, ret, cafn = stat_task->current_audio_format_num;
@@ -1286,7 +1286,7 @@ min_delay:
 }
 
 /* restart the client task if necessary */
-static int status_post_select(struct sched *s, void *context)
+static int status_post_monitor(struct sched *s, void *context)
 {
 	struct status_task *st = context;
 	int ret;
@@ -1377,8 +1377,8 @@ static void init_status_task(struct status_task *st)
 
 	stat_task->task = task_register(&(struct task_info) {
 		.name = "stat",
-		.pre_select = status_pre_select,
-		.post_select = status_post_select,
+		.pre_monitor = status_pre_monitor,
+		.post_monitor = status_post_monitor,
 		.context = stat_task,
 	}, &sched);
 }
@@ -1505,8 +1505,8 @@ int main(int argc, char *argv[])
 
 	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
-		.pre_select = signal_pre_select,
-		.post_select = signal_post_select,
+		.pre_monitor = signal_pre_monitor,
+		.post_monitor = signal_post_monitor,
 		.context = signal_task,
 	}, &sched);