[MPlayer-cvslog] r31459 - in trunk: cfg-common.h stream/network.h

[diego]

Author: diego
Date: Fri Jun 18 11:44:58 2010
New Revision: 31459

Log:
Move extern variable declarations for network.c to network.h.

Modified:
   trunk/cfg-common.h
   trunk/stream/network.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Fri Jun 18 11:41:53 2010	(r31458)
+++ trunk/cfg-common.h	Fri Jun 18 11:44:58 2010	(r31459)
@@ -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 field_dominance;
 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 */

Modified: trunk/stream/network.h
==============================================================================
--- trunk/stream/network.h	Fri Jun 18 11:41:53 2010	(r31458)
+++ trunk/stream/network.h	Fri Jun 18 11:44:58 2010	(r31459)
@@ -53,6 +53,16 @@ typedef struct {
 	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);