changeset 31393:496c8a6d045b

Move extern variable declarations for network.c to network.h.
author diego
date Fri, 18 Jun 2010 09:44:58 +0000
parents aba3834b6411
children 12ab6a252dc6
files cfg-common.h stream/network.h
diffstat 2 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Fri Jun 18 09:41:53 2010 +0000
+++ b/cfg-common.h	Fri Jun 18 09:44:58 2010 +0000
@@ -29,6 +29,7 @@
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/demux_ts.h"
 #include "osdep/priority.h"
+#include "stream/network.h"
 
 /* defined in codec-cfg.c */
 extern char * codecs_file;
@@ -40,17 +41,7 @@
 extern int audio_output_channels;
 extern int fakemono;
 
-/* defined in network.c */
-extern char *network_username;
-extern char *network_password;
-extern int   network_bandwidth;
-extern char *network_useragent;
-extern char *network_referrer;
-extern int   network_cookies_enabled;
-extern char *cookies_file;
-
 extern int network_prefer_ipv4;
-extern int network_ipv4_only_proxy;
 extern int reuse_socket;
 
 extern int dvd_speed; /* stream/stream_dvd.c */
--- a/stream/network.h	Fri Jun 18 09:41:53 2010 +0000
+++ b/stream/network.h	Fri Jun 18 09:44:58 2010 +0000
@@ -53,6 +53,16 @@
 	int demuxer_type;
 } mime_struct_t;
 
+extern char *cookies_file;
+extern char *network_password;
+extern char *network_referrer;
+extern char *network_useragent;
+extern char *network_username;
+
+extern int   network_bandwidth;
+extern int   network_cookies_enabled;
+extern int   network_ipv4_only_proxy;
+
 streaming_ctrl_t *streaming_ctrl_new(void);
 int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size);