Mercurial > mplayer.hg

diff gui/cfg.c @ 33470:90e5f5c28304
Add option '-gui-include'. This is the GUI counterpart to MPlayer's option '-include'.
author: ib
date: Sun, 05 Jun 2011 10:14:26 +0000
parents: c8977ae8c24f
children: d068eac6cbf9
--- a/gui/cfg.c	Sat Jun 04 10:27:45 2011 +0000
+++ b/gui/cfg.c	Sun Jun 05 10:14:26 2011 +0000
@@ -28,7 +28,6 @@
 #include "libmpcodecs/vd.h"
 #include "libvo/video_out.h"
 #include "libvo/x11_common.h"
-#include "m_option.h"
 #include "mixer.h"
 #include "mp_msg.h"
 #include "mpcommon.h"
@@ -245,6 +244,13 @@
     return s;
 }
 
+int cfg_gui_include(m_option_t *conf, char *filename)
+{
+    (void)conf;
+
+    return m_config_parse_config_file(gui_conf, filename);
+}
+
 int cfg_read(void)
 {
     char *cfg;