video output core: use var_Inherit

diff --git a/src/video_output/display.c b/src/video_output/display.c
index fe524d33a149d91b386763f69ab66e0cbd49bf0f..0b6caad48030b4039f6e4b384bba3104a34573c1 100644 (file)
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -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);

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 5be927895357496b248b81bf4c04d43395aec7c3..bfac617547103d5ec21a0cd60de4f6edb6a232a6 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -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 );

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index 10639f326c477300db9ba206a147905e9a2177e7..46c0ebe86a4ac70430f66e8053c330dd216c4c12 100644 (file)
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -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 )

diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index 6963f5039ef4136d5ce219e34ff44f3040d3918b..b6bf61d4da16abbfa2f4a06bf7c33f39bcb2208b 100644 (file)
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -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,

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index f929cf58a922557f73491e9ded2b89d4cae944bf..4dafe2bf6d9910e282a3115de5af7dfdfd2835fa 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -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;