Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv4769/libmpdemux Modified Files: demux_rawaudio.c demux_rawvideo.c demux_xmms.c open.c stream.h 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: demux_rawaudio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawaudio.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- demux_rawaudio.c 2 Apr 2003 19:23:28 -0000 1.8 +++ demux_rawaudio.c 13 Aug 2003 16:29:31 -0000 1.9 @@ -7,7 +7,6 @@ #include <string.h> #include "../m_option.h" -#include "../m_config.h" #include "stream.h" #include "demuxer.h" @@ -20,7 +19,7 @@ static int samplesize = 2; static int format = 0x1; // Raw PCM -config_t demux_rawaudio_opts[] = { +m_option_t demux_rawaudio_opts[] = { { "on", &demuxer_type, CONF_TYPE_FLAG, 0,0, DEMUXER_TYPE_RAWAUDIO, NULL }, { "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL }, { "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL }, Index: demux_rawvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawvideo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_rawvideo.c 18 Jun 2003 00:34:35 -0000 1.4 +++ demux_rawvideo.c 13 Aug 2003 16:29:31 -0000 1.5 @@ -7,7 +7,6 @@ #include <string.h> #include "../m_option.h" -#include "../m_config.h" #include "stream.h" #include "demuxer.h" @@ -23,7 +22,7 @@ static float fps = 25; static int imgsize=0; -config_t demux_rawvideo_opts[] = { +m_option_t demux_rawvideo_opts[] = { { "on", &demuxer_type, CONF_TYPE_FLAG, 0,0, DEMUXER_TYPE_RAWVIDEO, NULL }, // size: { "w", &width, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL }, Index: demux_xmms.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_xmms.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- demux_xmms.c 30 May 2003 17:57:41 -0000 1.7 +++ demux_xmms.c 13 Aug 2003 16:29:31 -0000 1.8 @@ -12,7 +12,7 @@ #include <string.h> #include <sys/stat.h> -#include "../cfgparser.h" +#include "../m_option.h" #include "../libao2/afmt.h" #include "stream.h" #include "demuxer.h" Index: open.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- open.c 11 Aug 2003 00:02:46 -0000 1.85 +++ open.c 13 Aug 2003 16:29:31 -0000 1.86 @@ -15,7 +15,7 @@ #include <sys/cdrio.h> #endif -#include "../m_config.h" +#include "../m_option.h" #include "stream.h" #include "demuxer.h" #include "mf.h" @@ -532,7 +532,7 @@ return open_stream_full(filename,STREAM_READ,options,file_format); } -int dvd_parse_chapter_range(struct config *conf, const char *range){ +int dvd_parse_chapter_range(m_option_t *conf, const char *range){ const char *s; char *t; /* conf; prevent warning from GCC */ Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- stream.h 17 May 2003 12:24:01 -0000 1.64 +++ stream.h 13 Aug 2003 16:29:31 -0000 1.65 @@ -241,12 +241,10 @@ stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format); //#ifdef USE_DVDREAD -struct config; extern int dvd_title; extern int dvd_chapter; extern int dvd_last_chapter; extern int dvd_angle; -int dvd_parse_chapter_range(struct config*, const char*); //#endif extern int dvbin_param_on;