Moved out text_style_* to src/misc/text_style.c

[vlc] / src / video_output / video_widgets.c

diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index 5d21183a1595f3c42cd9ce491b92501de60229c1..c1a6f7b799b766c0a0254bfdc33c401afb3cc125 100644 (file)
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -24,12 +24,20 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 
 #include <vlc_filter.h>
 
+/* TODO remove access to private vout data */
+#include "vout_internal.h"
+
 /*****************************************************************************
  * Displays an OSD slider.
  * Types are: OSD_HOR_SLIDER and OSD_VERT_SLIDER.
@@ -40,13 +48,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->p->fmt_render.i_width,
+                    p_vout->p->fmt_render.i_height,
+                    p_vout->p->fmt_in.i_x_offset,
+                    p_vout->p->fmt_in.i_height - p_vout->p->fmt_in.i_visible_height
+                                            - p_vout->p->fmt_in.i_y_offset,
+                    i_channel, i_position, i_type );
     }
     vlc_object_release( p_vout );
 }
@@ -62,15 +72,15 @@ 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,
-                  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,
+                  vout_GetSpu( p_vout ),
+                  p_vout->p->fmt_render.i_width,
+                  p_vout->p->fmt_render.i_height,
+                  p_vout->p->fmt_in.i_width - p_vout->p->fmt_in.i_visible_width
+                                         - p_vout->p->fmt_in.i_x_offset,
+                  p_vout->p->fmt_in.i_y_offset,
                   i_channel, i_type );
     }
     vlc_object_release( p_vout );