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 /libvo | |
| 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 'libvo')
| -rw-r--r-- | libvo/vo_bl.c | 2 | ||||
| -rw-r--r-- | libvo/vo_dxr2.c | 4 | ||||
| -rw-r--r-- | libvo/vo_zr.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c index d0aaeb9611..9452af8718 100644 --- a/libvo/vo_bl.c +++ b/libvo/vo_bl.c @@ -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 = diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c index e9235ba35b..d1afe2a0b2 100644 --- a/libvo/vo_dxr2.c +++ b/libvo/vo_dxr2.c @@ -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 ck_b = 0xFF; 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 }, diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index 2d4dd39b2f..814ecf2efd 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -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 @@ static uint32_t draw_slice(uint8_t *srcimg[], int stride[], /* 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 @@ vo_zr_parseoption(struct config * conf, char *opt, char *param){ 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; |