[MPlayer-dev-eng] [PATCH] new config parser related warning fixes (for GUI, too)

[Dominik Mierzejewski]

These fix the following warnings:

Patch #1:
cfg.c:184: warning: passing arg 2 of `m_config_register_options' from incompatible pointer type
cfg.c:249: warning: passing arg 1 of `m_option_print' from incompatible pointer type

Patch #2:
mplayer.c:643: warning: passing arg 2 of `m_config_register_options' from incompatible pointer type
mencoder.c:397: warning: passing arg 2 of `m_config_register_options' from incompatible pointer type
input.c:1454: warning: passing arg 2 of `m_config_register_options' from incompatible pointer type

OK to commit?

-- 
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
-------------- next part --------------
--- MPlayer-20021226/Gui/cfg.c.gui	Tue Dec  3 20:58:38 2002
+++ MPlayer-20021226/Gui/cfg.c	Fri Dec 27 01:07:28 2002
@@ -7,6 +7,9 @@
 #include "../mp_msg.h"
 #include "../mplayer.h"
 #include "../cfgparser.h"
+#ifndef NEW_CONFIG
+#include "../playtree.h"
+#endif
 
 #ifdef USE_SETLOCALE
 #include <locale.h>
@@ -56,13 +59,21 @@
 
 // ---
 
+#ifdef NEW_CONFIG 
+extern int
+m_config_parse_config_file(m_config_t* config, char *conffile);
+#endif 
 extern char * get_path( char * filename );
 extern int    flip;
 extern int    frame_dropping;
 extern int    stop_xscreensaver;
 
 static m_config_t * gui_conf;
+#ifdef NEW_CONFIG
+static m_option_t gui_opts[] =
+#else
 static config_t gui_opts[] =
+#endif
 {
  { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },
  
-------------- next part --------------
--- MPlayer-20021228/input/input.c.warn	Thu Dec 26 23:46:19 2002
+++ MPlayer-20021228/input/input.c	Sat Dec 28 17:39:33 2002
@@ -367,7 +367,11 @@
   { NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
+#ifdef NEW_CONFIG
+static m_option_t mp_input_opts[] = {
+#else
 static config_t mp_input_opts[] = {
+#endif
   { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
   { "nojoystick", &use_joystick,  CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
   { "joystick", &use_joystick,  CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
--- MPlayer-20021228/cfg-mplayer.h.warn	Thu Dec 26 23:46:16 2002
+++ MPlayer-20021228/cfg-mplayer.h	Sat Dec 28 17:39:33 2002
@@ -174,7 +174,11 @@
  * by Folke
  */
 
+#ifdef NEW_CONFIG
+static m_option_t mplayer_opts[]={
+#else
 static config_t mplayer_opts[]={
+#endif
 	/* name, pointer, type, flags, min, max */
 	{"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this don't need anymore to be the first!!! */
 
--- MPlayer-20021228/cfg-mencoder.h.warn	Fri Dec 27 23:46:21 2002
+++ MPlayer-20021228/cfg-mencoder.h	Sat Dec 28 17:39:33 2002
@@ -139,7 +139,11 @@
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
+#ifdef NEW_CONFIG
+static m_option_t mencoder_opts[]={
+#else
 static config_t mencoder_opts[]={
+#endif
 	/* name, pointer, type, flags, min, max */
 	{"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */