X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=4f270c4a50b35df749c8f9c3cf2bbeba9464eb7b;hb=e3a7e12639c34fd86d48a072beb48add8c498d09;hp=49fd7ae2a38b21339d424e52623cd5e425132681;hpb=742c8b3f79a59278ced71e1855da1846b157b494;p=paraslash.git

diff --git a/vss.c b/vss.c
index 49fd7ae2..4f270c4a 100644
--- a/vss.c
+++ b/vss.c
@@ -892,7 +892,7 @@ static void set_mmd_offset(void)
 	mmd->offset = tv2ms(&offset);
 }
 
-static void vss_pre_select(struct sched *s, void *context)
+static void vss_pre_monitor(struct sched *s, void *context)
 {
 	int i;
 	struct vss_task *vsst = context;
@@ -904,9 +904,9 @@ static void vss_pre_select(struct sched *s, void *context)
 	} else
 		sched_monitor_readfd(vsst->afs_socket, s);
 	FOR_EACH_SENDER(i) {
-		if (!senders[i]->pre_select)
+		if (!senders[i]->pre_monitor)
 			continue;
-		senders[i]->pre_select(s);
+		senders[i]->pre_monitor(s);
 	}
 	vss_compute_timeout(s, vsst);
 }
@@ -1016,7 +1016,7 @@ err:
 /**
  * Main sending function.
  *
- * This function gets called from vss_post_select(). It checks whether the next
+ * This function gets called from vss_post_monitor(). It checks whether the next
  * chunk of data should be pushed out. It obtains a pointer to the data to be
  * sent out as well as its length from mmd->afd.afhi. This information is then
  * passed to each supported sender's send() function as well as to the send()
@@ -1087,7 +1087,7 @@ static void vss_send(struct vss_task *vsst)
 	mmd->current_chunk++;
 }
 
-static int vss_post_select(struct sched *s, void *context)
+static int vss_post_monitor(struct sched *s, void *context)
 {
 	int ret, i;
 	struct vss_task *vsst = context;
@@ -1147,9 +1147,9 @@ static int vss_post_select(struct sched *s, void *context)
 			vsst->afsss = AFS_SOCKET_AFD_PENDING;
 	}
 	FOR_EACH_SENDER(i) {
-		if (!senders[i]->post_select)
+		if (!senders[i]->post_monitor)
 			continue;
-		senders[i]->post_select(s);
+		senders[i]->post_monitor(s);
 	}
 	if ((vss_playing() && !(mmd->vss_status_flags & VSS_PLAYING)) ||
 			(vss_next() && vss_playing()))
@@ -1194,8 +1194,8 @@ void vss_init(int afs_socket, struct sched *s)
 	}
 	vsst->task = task_register(&(struct task_info) {
 		.name = "vss",
-		.pre_select = vss_pre_select,
-		.post_select = vss_post_select,
+		.pre_monitor = vss_pre_monitor,
+		.post_monitor = vss_post_monitor,
 		.context = vsst,
 	}, s);
 }