Move struct senders[] from server.c to vss.c.

diff --git a/server.c b/server.c
index 611b61f74d8724e115371d7c67d2d6692be4aa13..190df8a14ebf9613399bea5e55f0ae65f741645a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -110,32 +110,6 @@ struct server_args_info conf;
 /** the file containing user information (public key, permissions) */
 char *user_list_file = NULL;
 
-extern void dccp_send_init(struct sender *);
-extern void http_send_init(struct sender *);
-extern void ortp_send_init(struct sender *);
-
-/** the list of supported senders */
-struct sender senders[] = {
-       {
-               .name = "http",
-               .init = http_send_init,
-       },
-       {
-               .name = "dccp",
-               .init = dccp_send_init,
-       },
-#ifdef HAVE_ORTP
-       {
-               .name = "ortp",
-               .init = ortp_send_init,
-       },
-#endif
-       {
-               .name = NULL,
-       }
-};
-
-
 /* global variables for server-internal use */
 static FILE *logfile;
 static int mmd_mutex, mmd_shm_id;

diff --git a/vss.c b/vss.c
index 8a9d5f613f308db356756b090017d0ef88162080..e21a1ff4fd13a715fc465c2c2758f72961856aa3 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -36,7 +36,33 @@ static struct timeval eof_barrier;
 static struct timeval autoplay_barrier;
 
 extern struct misc_meta_data *mmd;
-extern struct sender senders[];
+
+extern void dccp_send_init(struct sender *);
+extern void http_send_init(struct sender *);
+extern void ortp_send_init(struct sender *);
+
+/** the list of supported senders */
+struct sender senders[] = {
+       {
+               .name = "http",
+               .init = http_send_init,
+       },
+       {
+               .name = "dccp",
+               .init = dccp_send_init,
+       },
+#ifdef HAVE_ORTP
+       {
+               .name = "ortp",
+               .init = ortp_send_init,
+       },
+#endif
+       {
+               .name = NULL,
+       }
+};
+
+
 
 static char *map;