[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.154,1.155 cfg-mencoder.h,1.42,1.43 cfg-common.h,1.43,1.44

[Bertrand Baudet]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv27450

Modified Files:
	cfg-mplayer.h cfg-mencoder.h cfg-common.h 
Log Message:
Added -user -pass options for http authentication.


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- cfg-mplayer.h	4 Jun 2002 20:17:05 -0000	1.154
+++ cfg-mplayer.h	25 Jun 2002 08:09:16 -0000	1.155
@@ -99,6 +99,12 @@
 extern int nortc;
 #endif
 
+#ifdef STREAMING
+/* defined in network.c */
+extern char *network_username;
+extern char *network_password;
+#endif
+
 /* from libvo/aspect.c */
 extern float monitor_aspect;
 

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cfg-mencoder.h	13 May 2002 21:19:28 -0000	1.42
+++ cfg-mencoder.h	25 Jun 2002 08:09:16 -0000	1.43
@@ -20,6 +20,12 @@
 extern struct config divx4opts_conf[];
 #endif
 
+#ifdef STREAMING
+/* defined in network.c */
+extern char *network_username;
+extern char *network_password;
+#endif
+
 #ifdef HAVE_MP3LAME
 struct config lameopts_conf[]={
 	{"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cfg-common.h	2 Jun 2002 12:48:55 -0000	1.43
+++ cfg-common.h	25 Jun 2002 08:09:16 -0000	1.44
@@ -39,6 +39,13 @@
 	{"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 
+#ifdef STREAMING
+	{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"pass", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#else
+	{"user", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
+	
 // ------------------------- demuxer options --------------------
 
 	// number of frames to play/convert