X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=1805c92b62de84d7131bf71c905dc3d8d23a0d93;hp=62427717eab054950f8e26a02f3ecd3ff60d9e24;hb=633f7c0f0194cd8ec3a478d820f55dd6a752d915;hpb=db34194eaab9819772bd55ea1ab08c719ed8f1c8 diff --git a/server.c b/server.c index 62427717..1805c92b 100644 --- a/server.c +++ b/server.c @@ -33,6 +33,7 @@ #include "db.h" #include "server.h" #include "afs.h" +#include "afh.h" /* FIXME */ #include "config.h" #include "close_on_fork.h" #include "send.h" @@ -61,7 +62,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_handler afl[]; /* TODO: This is better handled by autoconf */ /** the list of supported audio file selectors */ @@ -450,10 +450,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,9 +470,7 @@ repeat: continue; if (!senders[i].post_select) continue; - senders[i].post_select(mmd->audio_format >= 0? - &afl[mmd->audio_format] : NULL, - &rfds, &wfds); + senders[i].post_select(&rfds, &wfds); } afs_send_chunk(); status_refresh();