Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv4769/libvo Modified Files: vo_bl.c vo_dxr2.c vo_zr.c Log Message: Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies. Index: vo_bl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_bl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vo_bl.c 11 Jun 2003 16:48:09 -0000 1.5 +++ vo_bl.c 13 Aug 2003 16:29:32 -0000 1.6 @@ -39,7 +39,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "../mp_msg.h" -#include "../cfgparser.h" +#include "../m_option.h" #include "fastmemcpy.h" static vo_info_t info = Index: vo_dxr2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr2.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- vo_dxr2.c 11 Nov 2002 15:20:25 -0000 1.15 +++ vo_dxr2.c 13 Aug 2003 16:29:32 -0000 1.16 @@ -16,7 +16,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "mp_msg.h" -#include "cfgparser.h" +#include "m_option.h" #include "sub.h" #ifdef X11_FULLSCREEN @@ -75,7 +75,7 @@ static int cr_left = 0, cr_right = 0; static int cr_top = 55, cr_bot = 300; -config_t dxr2_opts[] = { +m_option_t dxr2_opts[] = { { "overlay", &use_ol, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "nooverlay", &use_ol, CONF_TYPE_FLAG, 0, 1, 0, NULL}, { "overlay-ratio", &ol_ratio, CONF_TYPE_INT, CONF_RANGE, 1, 2500, NULL }, Index: vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- vo_zr.c 21 Jun 2003 23:22:38 -0000 1.24 +++ vo_zr.c 13 Aug 2003 16:29:32 -0000 1.25 @@ -25,7 +25,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "../mp_msg.h" -#include "../cfgparser.h" +#include "../m_option.h" #include "fastmemcpy.h" #include "jpeg_enc.h" @@ -644,7 +644,7 @@ /* copied and adapted from vo_aa_parseoption */ int -vo_zr_parseoption(struct config * conf, char *opt, char *param){ +vo_zr_parseoption(m_option_t* conf, char *opt, char *param){ /* got an option starting with zr */ zr_info_t *zr = &zr_info[zr_parsing]; int i; @@ -780,7 +780,7 @@ return ERR_NOT_AN_OPTION; } -void vo_zr_revertoption(config_t* opt,char* param) { +void vo_zr_revertoption(m_option_t* opt,char* param) { zr_info_t *zr = &zr_info[1]; zr_count = 1;