From: Andre Noll <maan@systemlinux.org>
Date: Sat, 12 Apr 2008 07:51:57 +0000 (+0200)
Subject: Move struct senders[] from server.c to vss.c.
X-Git-Tag: v0.3.3~90
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=926c584394c29354752458b06f7226f0da0dd35e;p=paraslash.git

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

diff --git a/server.c b/server.c
index 611b61f7..190df8a1 100644
--- 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 8a9d5f61..e21a1ff4 100644
--- 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;