vlc | branch: master | Rémi Duraffort <[email protected]> | Fri Oct 8 20:58:18 2010 +0200| [cad39a6be25e9366b49fbd2ab5554709e437bbad] | committer: Rémi Duraffort
Use var_Inherit. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cad39a6be25e9366b49fbd2ab5554709e437bbad --- modules/misc/dummy/decoder.c | 2 +- modules/misc/dummy/vout.c | 2 +- modules/misc/logger.c | 4 ++-- modules/video_output/sdl.c | 4 ++-- modules/video_output/yuv.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c index 956cfff..b229718 100644 --- a/modules/misc/dummy/decoder.c +++ b/modules/misc/dummy/decoder.c @@ -81,7 +81,7 @@ static int OpenDecoderCommon( vlc_object_t *p_this, bool b_force_dump ) #ifndef UNDER_CE if( !b_force_dump ) { - b_force_dump = var_CreateGetBool( p_dec, "dummy-save-es" ); + b_force_dump = var_InheritBool( p_dec, "dummy-save-es" ); } if( b_force_dump ) { diff --git a/modules/misc/dummy/vout.c b/modules/misc/dummy/vout.c index 02c4922..ae71e23 100644 --- a/modules/misc/dummy/vout.c +++ b/modules/misc/dummy/vout.c @@ -60,7 +60,7 @@ static int OpenVideoCommon(vlc_object_t *object, bool display_stat) /* p_vd->info is not modified */ - char *chroma = var_CreateGetNonEmptyString(vd, "dummy-chroma"); + char *chroma = var_InheritString(vd, "dummy-chroma"); if (chroma) { vlc_fourcc_t fcc = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma); if (fcc != 0) { diff --git a/modules/misc/logger.c b/modules/misc/logger.c index e834722..a51024d 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -203,7 +203,7 @@ static int Open( vlc_object_t *p_this ) p_sys->msg.p_intf = p_intf; p_sys->msg.i_mode = MODE_TEXT; - psz_mode = var_CreateGetString( p_intf, "logmode" ); + psz_mode = var_InheritString( p_intf, "logmode" ); if( psz_mode ) { if( !strcmp( psz_mode, "text" ) ) @@ -290,7 +290,7 @@ static int Open( vlc_object_t *p_this ) p_sys->msg.p_file = NULL; #ifdef HAVE_SYSLOG_H int i_facility; - char *psz_facility = var_CreateGetString( p_intf, "syslog-facility" ); + char *psz_facility = var_InheritString( p_intf, "syslog-facility" ); if( psz_facility ) { bool b_valid = 0; diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c index efebbff..cc28fa5 100644 --- a/modules/video_output/sdl.c +++ b/modules/video_output/sdl.c @@ -206,7 +206,7 @@ static int Open(vlc_object_t *object) /* */ vlc_fourcc_t forced_chroma = 0; - char *psz_chroma = var_CreateGetNonEmptyString(vd, "sdl-chroma"); + char *psz_chroma = var_InheritString(vd, "sdl-chroma"); if (psz_chroma) { forced_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, psz_chroma); if (forced_chroma) @@ -217,7 +217,7 @@ static int Open(vlc_object_t *object) /* Try to open an overlay if requested */ sys->overlay = NULL; - const bool is_overlay = var_CreateGetBool(vd, "overlay"); + const bool is_overlay = var_InheritBool(vd, "overlay"); if (is_overlay) { static const struct { diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c index 845e43b..a10a1b1 100644 --- a/modules/video_output/yuv.c +++ b/modules/video_output/yuv.c @@ -108,11 +108,11 @@ static int Open(vlc_object_t *object) return VLC_ENOMEM; sys->is_first = false; - sys->is_yuv4mpeg2 = var_CreateGetBool(vd, CFG_PREFIX "yuv4mpeg2"); + sys->is_yuv4mpeg2 = var_InheritBool(vd, CFG_PREFIX "yuv4mpeg2"); sys->pool = NULL; /* */ - char *psz_fcc = var_CreateGetNonEmptyString(vd, CFG_PREFIX "chroma"); + char *psz_fcc = var_InheritString(vd, CFG_PREFIX "chroma"); const vlc_fourcc_t requested_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, psz_fcc); free(psz_fcc); @@ -135,7 +135,7 @@ static int Open(vlc_object_t *object) msg_Dbg(vd, "Using chroma %4.4s", (char *)&chroma); /* */ - char *name = var_CreateGetNonEmptyString(vd, CFG_PREFIX "file"); + char *name = var_InheritString(vd, CFG_PREFIX "file"); if (!name) { msg_Err(vd, "Empty file name"); free(sys); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
