Mercurial > mplayer.hg

changeset 162:effc62af528c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new option: -include
author szabii
date Mon, 19 Mar 2001 18:14:21 +0000
parents 9008302e2dc0
children c94413099c9b
files cfg-mplayer.h mplayer.c mplayerHQ.c
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-mplayer.h	Mon Mar 19 15:09:47 2001 +0000
+++ b/cfg-mplayer.h	Mon Mar 19 18:14:21 2001 +0000
@@ -4,6 +4,7 @@
 
 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},
 	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
--- a/mplayer.c	Mon Mar 19 15:09:47 2001 +0000
+++ b/mplayer.c	Mon Mar 19 18:14:21 2001 +0000
@@ -83,6 +83,10 @@
     return 0;
 }
 
+static int cfg_include(struct config *conf, char *filename){
+	return parse_config_file(conf, filename);
+}
+
 static int max_framesize=0;
 
 static int dbg_es_sent=0;
--- a/mplayerHQ.c	Mon Mar 19 15:09:47 2001 +0000
+++ b/mplayerHQ.c	Mon Mar 19 18:14:21 2001 +0000
@@ -85,6 +85,10 @@
     return 0;
 }
 
+static int cfg_include(struct config *conf, char *filename){
+	return parse_config_file(conf, filename);
+}
+
 static int max_framesize=0;
 
 static int dbg_es_sent=0;