X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=2391e07c360d93f68e85a76c99bc783e1f2d4bc0;hp=6f70d977d0814e0c7fa5a54581baf405397ea259;hb=8cec3d1edb26b4861e2b5bdbb9f70241cdd7f03b;hpb=8f2cf66189cc863c3af702f78bb68596f2f3ef12

diff --git a/server.c b/server.c
index 6f70d977..2391e07c 100644
--- a/server.c
+++ b/server.c
@@ -61,7 +61,6 @@ char *user_list = NULL;
 extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
-extern struct audio_format afl[];
 
 /* TODO: This is better handled by autoconf */
 /** the list of supported audio file selectors */
@@ -450,10 +449,7 @@ repeat:
 			continue;
 		if (!senders[i].pre_select)
 			continue;
-		senders[i].pre_select(mmd->audio_format >= 0?
-			&afl[mmd->audio_format] : NULL,
-			&max_fileno,
-			&rfds, &wfds);
+		senders[i].pre_select( &max_fileno, &rfds, &wfds);
 	}
 	if (selectors[mmd->selector_num].pre_select) {
 		ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
@@ -473,14 +469,10 @@ repeat:
 			continue;
 		if (!senders[i].post_select)
 			continue;
-		senders[i].post_select(mmd->audio_format >= 0?
-			&afl[mmd->audio_format] : NULL,
-			&rfds, &wfds);
-	}
-	if (!ret) {
-		afs_send_chunk();
-		status_refresh();
+		senders[i].post_select(&rfds, &wfds);
 	}
+	afs_send_chunk();
+	status_refresh();
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig;
 		sig = para_next_signal();