/*****************************************************************************
* osd_widgets.c : OSD widgets manipulation functions
*****************************************************************************
- * Copyright (C) 2004-2005 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Author: Yoann Peronneau <yoann@videolan.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <vlc/vout.h>
-#include <vlc_osd.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc_video.h>
+#include <vlc/vlc.h>
+#include <vlc_osd.h>
+#include <vlc_vout.h>
#include <vlc_filter.h>
#define STYLE_EMPTY 0
*****************************************************************************/
int osd_Slider( vlc_object_t *p_this, spu_t *p_spu,
int i_render_width, int i_render_height,
+ int i_margin_left, int i_margin_bottom,
int i_channel, int i_position, short i_type )
{
subpicture_t *p_subpic;
int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height;
+ (void)p_this;
p_subpic = osd_CreateWidget( p_spu, i_channel );
if( p_subpic == NULL )
}
i_y_margin = i_render_height / 10;
- i_x_margin = i_y_margin;
+ i_x_margin = i_y_margin + i_margin_left;
+ i_y_margin += i_margin_bottom;
+
if( i_type == OSD_HOR_SLIDER )
{
i_width = i_render_width - 2 * i_x_margin;
* Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON, OSD_SPEAKER_ICON, OSD_MUTE_ICON
*****************************************************************************/
int osd_Icon( vlc_object_t *p_this, spu_t *p_spu,
- int i_render_width, int i_render_height, int i_channel, short i_type )
+ int i_render_width, int i_render_height, int i_margin_right,
+ int i_margin_top, int i_channel, short i_type )
{
subpicture_t *p_subpic;
int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height;
+ (void)p_this;
p_subpic = osd_CreateWidget( p_spu, i_channel );
if( p_subpic == NULL )
}
i_y_margin = i_render_height / 15;
- i_x_margin = i_y_margin;
+ i_x_margin = i_y_margin + i_margin_right;
+ i_y_margin += i_margin_top;
i_width = i_render_width / 20;
i_height = i_width;
i_x = i_render_width - i_x_margin - i_width;