Removed dead code (vout).

[vlc] / src / video_output / video_widgets.c

diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index f0a1ded2bc0098f223d20a4196226232a0bd9a5f..cbc2c30903855f4e4d40b09ea795bfc7707462b7 100644 (file)
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -44,13 +44,15 @@ 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,
-            p_vout->fmt_in.i_height - p_vout->fmt_in.i_visible_height
-                                    - p_vout->fmt_in.i_y_offset,
-            i_channel, i_position, i_type );
+        osd_Slider( p_caller, vout_GetSpu( p_vout ),
+                    p_vout->fmt_render.i_width,
+                    p_vout->fmt_render.i_height,
+                    p_vout->fmt_in.i_x_offset,
+                    p_vout->fmt_in.i_height - p_vout->fmt_in.i_visible_height
+                                            - p_vout->fmt_in.i_y_offset,
+                    i_channel, i_position, i_type );
     }
     vlc_object_release( p_vout );
 }
@@ -66,12 +68,12 @@ 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,
-                  p_vout->render.i_width,
-                  p_vout->render.i_height,
+                  vout_GetSpu( p_vout ),
+                  p_vout->fmt_render.i_width,
+                  p_vout->fmt_render.i_height,
                   p_vout->fmt_in.i_width - p_vout->fmt_in.i_visible_width
                                          - p_vout->fmt_in.i_x_offset,
                   p_vout->fmt_in.i_y_offset,