[MPlayer-cvslog] r33558 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 cfg-mplayer.h gui/cfg.c gui/cfg.h

[ib]

Author: ib
Date: Sun Jun  5 12:14:26 2011
New Revision: 33558

Log:
Add option '-gui-include'.

This is the GUI counterpart to MPlayer's option '-include'.

Modified:
   trunk/cfg-mplayer.h
   trunk/gui/cfg.c
   trunk/gui/cfg.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/de/mplayer.1
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Sat Jun  4 12:27:45 2011	(r33557)
+++ trunk/cfg-mplayer.h	Sun Jun  5 12:14:26 2011	(r33558)
@@ -308,6 +308,7 @@ const m_option_t mplayer_opts[]={
     {"enqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"noenqueue", &enqueue, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"guiwid", &guiWinID, CONF_TYPE_INT, 0, 0, 0, NULL},
+    {"gui-include", cfg_gui_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL},
 #endif
 
     {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Sat Jun  4 12:27:45 2011	(r33557)
+++ trunk/gui/cfg.c	Sun Jun  5 12:14:26 2011	(r33558)
@@ -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 @@ static char *gfgets(char *str, int size,
     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;

Modified: trunk/gui/cfg.h
==============================================================================
--- trunk/gui/cfg.h	Sat Jun  4 12:27:45 2011	(r33557)
+++ trunk/gui/cfg.h	Sun Jun  5 12:14:26 2011	(r33558)
@@ -20,6 +20,7 @@
 #define MPLAYER_GUI_CFG_H
 
 #include "m_config.h"
+#include "m_option.h"
 
 extern m_config_t *gui_conf;
 
@@ -81,6 +82,7 @@ extern int gui_main_pos_y;
 extern int gui_sub_pos_x;
 extern int gui_sub_pos_y;
 
+int cfg_gui_include(m_option_t *conf, char *filename);
 int cfg_read(void);
 int cfg_write(void);