[Mplayer-cvslog] CVS: main cfg-common.h,1.74,1.75 cfg-mencoder.h,1.60,1.61 cfg-mplayer.h,1.189,1.190 m_option.c,1.4,1.5 m_option.h,1.2,1.3

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv31022

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h m_option.c 
	m_option.h 
Log Message:
pphelp


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- cfg-common.h	28 Dec 2002 22:57:24 -0000	1.74
+++ cfg-common.h	3 Jan 2003 12:40:09 -0000	1.75
@@ -141,6 +141,7 @@
         {"oldpp", "MPlayer was compiled without opendivx library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 	{"npp", "-npp has been removed, use -vop pp and read the fine manual\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+        {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL},
 
 	{"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cfg-mencoder.h	27 Dec 2002 22:43:15 -0000	1.60
+++ cfg-mencoder.h	3 Jan 2003 12:40:09 -0000	1.61
@@ -14,6 +14,7 @@
 extern int sws_flags;
 extern int readPPOpt(void *, char *arg);
 extern void revertPPOpt(void *conf, char* opt);
+extern char *pp_help;
 
 #ifdef HAVE_DIVX4ENCORE
 extern struct config divx4opts_conf[];

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- cfg-mplayer.h	2 Jan 2003 16:51:19 -0000	1.189
+++ cfg-mplayer.h	3 Jan 2003 12:40:09 -0000	1.190
@@ -160,7 +160,7 @@
 extern int sws_flags;
 extern int readPPOpt(void *conf, char *arg);
 extern void revertPPOpt(void *conf, char* opt);
-
+extern char* pp_help;
 
 /*
  * CONF_TYPE_FUNC_FULL :

Index: m_option.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- m_option.c	6 Dec 2002 17:11:50 -0000	1.4
+++ m_option.c	3 Jan 2003 12:40:09 -0000	1.5
@@ -765,7 +765,11 @@
 /////////////////// Print
 
 static int parse_print(m_option_t* opt,char *name, char *param, void* dst, int src) {
-  mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", (char *) opt->p);
+  if(opt->type->flags&M_OPT_TYPE_INDIRECT)
+    mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", *(char **) opt->p);
+  else
+    mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", (char *) opt->p);
+
   if(opt->priv == NULL)
     exit(1); // Call something else instead ??
   return 1;
@@ -783,6 +787,20 @@
   NULL,
   NULL
 };
+
+m_option_type_t m_option_type_print_indirect = {
+  "Print",
+  "",
+  0,
+  M_OPT_TYPE_INDIRECT,
+  parse_print,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL
+};
+
 
 /////////////////////// Subconfig
 #undef VAL

Index: m_option.h
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- m_option.h	12 Nov 2002 12:39:05 -0000	1.2
+++ m_option.h	3 Jan 2003 12:40:09 -0000	1.3
@@ -17,6 +17,7 @@
 extern m_option_type_t m_option_type_position;
 
 extern m_option_type_t m_option_type_print;
+extern m_option_type_t m_option_type_print_indirect;
 extern m_option_type_t m_option_type_subconfig;
 extern m_option_type_t m_option_type_imgfmt;
 
@@ -59,6 +60,7 @@
 #define CONF_TYPE_FUNC		(&m_option_type_func)
 #define CONF_TYPE_FUNC_PARAM	(&m_option_type_func_param)
 #define CONF_TYPE_PRINT		(&m_option_type_print)
+#define CONF_TYPE_PRINT_INDIRECT (&m_option_type_print_indirect)
 #define CONF_TYPE_FUNC_FULL	(&m_option_type_func_full)
 #define CONF_TYPE_SUBCONFIG	(&m_option_type_subconfig)
 #define CONF_TYPE_STRING_LIST           (&m_option_type_string_list)