mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
Use var_Inherit.
This commit is contained in:
parent
4cda86b74f
commit
cad39a6be2
@ -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 )
|
||||
{
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user