Commit cad39a6b authored by Rémi Duraffort's avatar Rémi Duraffort

Use var_Inherit.

parent 4cda86b7
...@@ -81,7 +81,7 @@ static int OpenDecoderCommon( vlc_object_t *p_this, bool b_force_dump ) ...@@ -81,7 +81,7 @@ static int OpenDecoderCommon( vlc_object_t *p_this, bool b_force_dump )
#ifndef UNDER_CE #ifndef UNDER_CE
if( !b_force_dump ) 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 ) if( b_force_dump )
{ {
......
...@@ -60,7 +60,7 @@ static int OpenVideoCommon(vlc_object_t *object, bool display_stat) ...@@ -60,7 +60,7 @@ static int OpenVideoCommon(vlc_object_t *object, bool display_stat)
/* p_vd->info is not modified */ /* p_vd->info is not modified */
char *chroma = var_CreateGetNonEmptyString(vd, "dummy-chroma"); char *chroma = var_InheritString(vd, "dummy-chroma");
if (chroma) { if (chroma) {
vlc_fourcc_t fcc = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma); vlc_fourcc_t fcc = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma);
if (fcc != 0) { if (fcc != 0) {
......
...@@ -203,7 +203,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -203,7 +203,7 @@ static int Open( vlc_object_t *p_this )
p_sys->msg.p_intf = p_intf; p_sys->msg.p_intf = p_intf;
p_sys->msg.i_mode = MODE_TEXT; 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( psz_mode )
{ {
if( !strcmp( psz_mode, "text" ) ) if( !strcmp( psz_mode, "text" ) )
...@@ -290,7 +290,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -290,7 +290,7 @@ static int Open( vlc_object_t *p_this )
p_sys->msg.p_file = NULL; p_sys->msg.p_file = NULL;
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
int i_facility; int i_facility;
char *psz_facility = var_CreateGetString( p_intf, "syslog-facility" ); char *psz_facility = var_InheritString( p_intf, "syslog-facility" );
if( psz_facility ) if( psz_facility )
{ {
bool b_valid = 0; bool b_valid = 0;
......
...@@ -206,7 +206,7 @@ static int Open(vlc_object_t *object) ...@@ -206,7 +206,7 @@ static int Open(vlc_object_t *object)
/* */ /* */
vlc_fourcc_t forced_chroma = 0; 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) { if (psz_chroma) {
forced_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, psz_chroma); forced_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, psz_chroma);
if (forced_chroma) if (forced_chroma)
...@@ -217,7 +217,7 @@ static int Open(vlc_object_t *object) ...@@ -217,7 +217,7 @@ static int Open(vlc_object_t *object)
/* Try to open an overlay if requested */ /* Try to open an overlay if requested */
sys->overlay = NULL; sys->overlay = NULL;
const bool is_overlay = var_CreateGetBool(vd, "overlay"); const bool is_overlay = var_InheritBool(vd, "overlay");
if (is_overlay) { if (is_overlay) {
static const struct static const struct
{ {
......
...@@ -108,11 +108,11 @@ static int Open(vlc_object_t *object) ...@@ -108,11 +108,11 @@ static int Open(vlc_object_t *object)
return VLC_ENOMEM; return VLC_ENOMEM;
sys->is_first = false; 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; 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, const vlc_fourcc_t requested_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES,
psz_fcc); psz_fcc);
free(psz_fcc); free(psz_fcc);
...@@ -135,7 +135,7 @@ static int Open(vlc_object_t *object) ...@@ -135,7 +135,7 @@ static int Open(vlc_object_t *object)
msg_Dbg(vd, "Using chroma %4.4s", (char *)&chroma); 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) { if (!name) {
msg_Err(vd, "Empty file name"); msg_Err(vd, "Empty file name");
free(sys); free(sys);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment