X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=b47065880c1553e0747ffad7124e3a7d6272d7e5;hb=7ff087268774d4bb7838a8575d2d9471ab52a27d;hp=adc0cb63cea1204d3bfef811c492b807b74001c2;hpb=f32c0776882e01913c64c8ccbf2d94e0fb4d6369;p=paraslash.git

diff --git a/vss.c b/vss.c
index adc0cb63..b4706588 100644
--- a/vss.c
+++ b/vss.c
@@ -636,18 +636,6 @@ static void vss_eof(struct vss_task *vsst)
 	mmd->events++;
 }
 
-/**
- * Get the list of all supported audio formats.
- *
- * \return Aa space separated list of all supported audio formats
- * It is not allocated at runtime, i.e. there is no need to free
- * the returned string in the caller.
- */
-const char *supported_audio_formats(void)
-{
-	return SUPPORTED_AUDIO_FORMATS;
-}
-
 static int need_to_request_new_audio_file(struct vss_task *vsst)
 {
 	struct timeval diff;
@@ -690,7 +678,7 @@ static void set_mmd_offset(void)
 static void vss_pre_select(struct sched *s, struct task *t)
 {
 	int i;
-	struct timeval *tv, diff;
+	struct timeval *tv;
 	struct vss_task *vsst = container_of(t, struct vss_task, task);
 
 	if (!vsst->map || vss_next() || vss_paused() || vss_repos()) {
@@ -731,8 +719,8 @@ static void vss_pre_select(struct sched *s, struct task *t)
 		senders[i].pre_select(&s->max_fileno, &s->rfds, &s->wfds);
 	}
 	tv = vss_compute_timeout(vsst);
-	if (tv && tv_diff(tv, &s->timeout, &diff) < 0)
-		s->timeout = *tv;
+	if (tv)
+		sched_request_timeout(tv, s);
 }
 
 static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)