[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.5,1.6 mplayer.c,1.21,1.22 mplayerHQ.c,1.5,1.6

[Szabolcs Berecz]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv10193

Modified Files:
	cfg-mplayer.h mplayer.c mplayerHQ.c 
Log Message:
new option: -include

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cfg-mplayer.h	2001/03/19 03:45:49	1.5
--- cfg-mplayer.h	2001/03/19 18:14:21	1.6
***************
*** 5,8 ****
--- 5,9 ----
  struct config conf[]={
  	/* name, pointer, type, flags, min, max */
+ 	{"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
  	{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
              CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** mplayer.c	2001/03/19 03:49:04	1.21
--- mplayer.c	2001/03/19 18:14:21	1.22
***************
*** 84,87 ****
--- 84,91 ----
  }
  
+ static int cfg_include(struct config *conf, char *filename){
+ 	return parse_config_file(conf, filename);
+ }
+ 
  static int max_framesize=0;
  

Index: mplayerHQ.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayerHQ.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mplayerHQ.c	2001/03/19 13:23:11	1.5
--- mplayerHQ.c	2001/03/19 18:14:21	1.6
***************
*** 86,89 ****
--- 86,93 ----
  }
  
+ static int cfg_include(struct config *conf, char *filename){
+ 	return parse_config_file(conf, filename);
+ }
+ 
  static int max_framesize=0;
  


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog