new option: -include

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@163 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 9 insertions, 0 deletions

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 1505fb13c0..c9c68f1c70 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -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},
diff --git a/mplayer.c b/mplayer.c
index b58bb32cb8..dbf30d977c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -83,6 +83,10 @@ static int cfg_inc_verbose(struct config *conf){
     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;
diff --git a/mplayerHQ.c b/mplayerHQ.c
index 43f7bcea3b..6a81dff0a2 100644
--- a/mplayerHQ.c
+++ b/mplayerHQ.c
@@ -85,6 +85,10 @@ static int cfg_inc_verbose(struct config *conf){
     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;