Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv8323/libvo Modified Files: video_out.c vo_dxr2.c Log Message: cleanup config option handling in libmpdemux. removed overcompilacted m_config_register_options() mess - export the subconfig structs instead Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- video_out.c 29 Sep 2002 21:53:05 -0000 1.61 +++ video_out.c 23 Oct 2002 17:21:01 -0000 1.62 @@ -184,16 +184,6 @@ NULL }; -#ifdef HAVE_DXR2 -extern void vo_dxr2_register_options(void*); -#endif - -void libvo_register_options(void* cfg) { -#ifdef HAVE_DXR2 - vo_dxr2_register_options(cfg); -#endif -} - void list_video_out(){ int i=0; mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers); Index: vo_dxr2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr2.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vo_dxr2.c 3 Sep 2002 15:18:39 -0000 1.9 +++ vo_dxr2.c 23 Oct 2002 17:21:01 -0000 1.10 @@ -61,7 +61,7 @@ static int ignore_cache = 0; static int update_cache = 0; -static config_t dxr2_opts[] = { +config_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 }, @@ -95,15 +95,6 @@ { "update-cache",&update_cache,CONF_TYPE_FLAG, 0, 0, 1, NULL}, { NULL,NULL, 0, 0, 0, 0, NULL} }; - -static config_t dxr2_opt[] = { - { "dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - { NULL,NULL, 0, 0, 0, 0, NULL} -}; - -void vo_dxr2_register_options(m_config_t* cfg) { - m_config_register_options(cfg,dxr2_opt); -} static vo_info_t vo_info = { "DXR2 video out",