diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-13 16:29:32 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-13 16:29:32 +0000 |
commit | 2283b6305f9a9d0d287705348f8ee9d1333caa99 (patch) | |
tree | 22bcfcb52ed464003c938bedf2193f0681cdf78c /libmpdemux | |
parent | 7dadaf5e397fd9bbf7e813ee8226636b79eca78a (diff) | |
download | mpv-2283b6305f9a9d0d287705348f8ee9d1333caa99.tar.bz2 mpv-2283b6305f9a9d0d287705348f8ee9d1333caa99.tar.xz |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_rawaudio.c | 3 | ||||
-rw-r--r-- | libmpdemux/demux_rawvideo.c | 3 | ||||
-rw-r--r-- | libmpdemux/demux_xmms.c | 2 | ||||
-rw-r--r-- | libmpdemux/open.c | 4 | ||||
-rw-r--r-- | libmpdemux/stream.h | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c index 1dc3963d7f..f096599abc 100644 --- a/libmpdemux/demux_rawaudio.c +++ b/libmpdemux/demux_rawaudio.c @@ -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 samplerate = 44100; 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 }, diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index e99b52d9ba..cf8fcb4210 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -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 int height = 0; 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 }, diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index 5bfc64a410..44a09a2217 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -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" diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 1f9e99731f..84a9f0d9aa 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -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 @@ if(strncmp("dvd://",filename,6) == 0){ 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 */ diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index f9aa74d9d2..a971def2b1 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -241,12 +241,10 @@ stream_t* open_stream(char* filename,char** options,int* file_format); 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; |