Commit 3d3d0ee3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

video output core: use var_Inherit

parent 42301e49
......@@ -1472,7 +1472,7 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd, c
VLC_UNUSED(vd);
vout_window_cfg_t cfg_override = *cfg;
if( !config_GetInt( vout, "embedded-video" ) )
if( !var_InheritBool( vout, "embedded-video" ) )
cfg_override.is_standalone = true;
return vout_window_New(VLC_OBJECT(vout), NULL, &cfg_override);
......
......@@ -739,7 +739,7 @@ void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title )
{
assert( psz_title );
if( !config_GetInt( p_vout, "osd" ) )
if( !var_InheritBool( p_vout, "osd" ) )
return;
vlc_mutex_lock( &p_vout->change_lock );
......
......@@ -130,7 +130,7 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
char *psz_string = NULL;
va_list args;
if( !config_GetInt( p_caller, "osd" ) ) return;
if( !var_InheritBool( p_caller, "osd" ) ) return;
p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_vout )
......
......@@ -44,7 +44,7 @@ void vout_OSDSlider( vlc_object_t *p_caller, int i_channel, int i_position,
vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if( p_vout && ( config_GetInt( p_caller, "osd" ) && ( i_position >= 0 ) ) )
if( p_vout && ( var_InheritBool( p_caller, "osd" ) && ( i_position >= 0 ) ) )
{
osd_Slider( p_caller, p_vout->p_spu, p_vout->render.i_width,
p_vout->render.i_height, p_vout->fmt_in.i_x_offset,
......@@ -66,7 +66,7 @@ void vout_OSDIcon( vlc_object_t *p_caller, int i_channel, short i_type )
if( !p_vout ) return;
if( config_GetInt( p_caller, "osd" ) )
if( var_InheritBool( p_caller, "osd" ) )
{
osd_Icon( p_caller,
p_vout->p_spu,
......
......@@ -214,7 +214,7 @@ spu_t *__spu_Create( vlc_object_t *p_this )
p_sys->p_scale = NULL;
p_sys->p_scale_yuvp = NULL;
p_sys->i_margin = config_GetInt( p_spu, "sub-margin" );
p_sys->i_margin = var_InheritInteger( p_spu, "sub-margin" );
/* Register the default subpicture channel */
p_sys->i_channel = 2;
......
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