Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv8323 Modified Files: Makefile cfg-common.h cfg-mplayer.h mencoder.c mplayer.c Removed Files: me-opt-reg.c mp-opt-reg.c Log Message: cleanup config option handling in libmpdemux. removed overcompilacted m_config_register_options() mess - export the subconfig structs instead Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- Makefile 19 Oct 2002 17:31:36 -0000 1.223 +++ Makefile 23 Oct 2002 17:20:59 -0000 1.224 @@ -27,8 +27,8 @@ INSTALL = install SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c -SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c me-opt-reg.c xvid_vbr.c -SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c mp-opt-reg.c +SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c +SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c ifeq ($(UNRARLIB),yes) SRCS_COMMON += unrarlib.c Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- cfg-common.h 22 Oct 2002 07:55:52 -0000 1.64 +++ cfg-common.h 23 Oct 2002 17:20:59 -0000 1.65 @@ -71,6 +71,22 @@ {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, + { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "nohr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + + { "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + +#ifdef HAVE_CDDA + { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +#endif + + // demuxer.c - select audio/sub file/demuxer + { "audiofile", &audio_stream, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "subfile", &sub_stream, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "demuxer", &demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, + { "audio-demuxer", &audio_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, + { "sub-demuxer", &sub_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, + {"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, #ifdef USE_TV {"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, @@ -198,6 +214,15 @@ extern char *network_password; extern int network_bandwidth; #endif + +/* defined in libmpdemux: */ +extern int hr_mp3_seek; +extern config_t demux_rawaudio_opts[]; +extern config_t cdda_opts[]; + +extern char* audio_stream; +extern char* sub_stream; +extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; #include "libmpdemux/tv.h" Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- cfg-mplayer.h 23 Oct 2002 16:52:34 -0000 1.175 +++ cfg-mplayer.h 23 Oct 2002 17:20:59 -0000 1.176 @@ -89,6 +89,10 @@ extern void vo_zr_revertoption(config_t* opt,char* pram); #endif +#ifdef HAVE_DXR2 +extern config_t dxr2_opts[]; +#endif + #ifdef STREAMING_LIVE_DOT_COM extern int isSDPFile; extern int rtspStreamOverTCP; @@ -302,6 +306,10 @@ #ifdef HAVE_ZR // -vo zr {"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption }, +#endif + +#ifdef HAVE_DXR2 + {"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif #ifdef STREAMING_LIVE_DOT_COM Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- mencoder.c 19 Oct 2002 20:26:02 -0000 1.177 +++ mencoder.c 23 Oct 2002 17:20:59 -0000 1.178 @@ -77,7 +77,7 @@ //-------------------------- // cache2: -static int stream_cache_size=0; +int stream_cache_size=0; #ifdef USE_STREAM_CACHE extern int cache_fill_status; #else @@ -269,8 +269,6 @@ return size; } -extern void me_register_options(m_config_t* cfg); - //--------------------------------------------------------------------------- static int at_eof=0; @@ -370,7 +368,6 @@ playtree = play_tree_new(); mconfig = m_config_new(playtree); m_config_register_options(mconfig,mencoder_opts); - me_register_options(mconfig); parse_cfgfiles(mconfig); if(m_config_parse_command_line(mconfig, argc, argv) < 0) mencoder_exit(1, "error parsing cmdline"); Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.600 retrieving revision 1.601 diff -u -r1.600 -r1.601 --- mplayer.c 23 Oct 2002 15:48:39 -0000 1.600 +++ mplayer.c 23 Oct 2002 17:20:59 -0000 1.601 @@ -431,7 +431,7 @@ //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); -extern void mp_register_options(m_config_t* cfg); +extern void mp_input_register_options(m_config_t* cfg); #include "mixer.h" #include "cfg-mplayer.h" @@ -580,7 +580,7 @@ mconfig = m_config_new(playtree); m_config_register_options(mconfig,mplayer_opts); // TODO : add something to let modules register their options - mp_register_options(mconfig); + mp_input_register_options(mconfig); parse_cfgfiles(mconfig); #ifdef HAVE_NEW_GUI --- me-opt-reg.c DELETED --- --- mp-opt-reg.c DELETED ---