[vlc-commits] commit: OSD: remove unused (and obtained unsafely) SPU parameter ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Sun Aug 15 18:19:49 CEST 2010
vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 15 18:28:13 2010 +0300| [aa401e54548ee368ef0ff6a2d9da4e4d6f1ce1a2] | committer: Rémi Denis-Courmont
OSD: remove unused (and obtained unsafely) SPU parameter
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=aa401e54548ee368ef0ff6a2d9da4e4d6f1ce1a2
---
src/osd/osd_widgets.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/osd/osd_widgets.c b/src/osd/osd_widgets.c
index ef9dd7b..9e893f2 100644
--- a/src/osd/osd_widgets.c
+++ b/src/osd/osd_widgets.c
@@ -42,7 +42,7 @@
static void DrawRect( subpicture_t *, int, int, int, int, short );
static void DrawTriangle( subpicture_t *, int, int, int, int, short );
static int CreatePicture( spu_t *, subpicture_t *, int, int, int, int );
-static subpicture_t *osd_CreateWidget( spu_t *, int );
+static subpicture_t *osd_CreateWidget( int );
/*****************************************************************************
* Draws a rectangle at the given position in the subpic.
@@ -190,13 +190,11 @@ static int CreatePicture( spu_t *p_spu, subpicture_t *p_subpic,
/*****************************************************************************
* Creates and initializes an OSD widget.
*****************************************************************************/
-subpicture_t *osd_CreateWidget( spu_t *p_spu, int i_channel )
+static subpicture_t *osd_CreateWidget( int i_channel )
{
subpicture_t *p_subpic;
mtime_t i_now = mdate();
- VLC_UNUSED(p_spu);
-
/* Create and initialize a subpicture */
p_subpic = subpicture_New();
if( p_subpic == NULL ) return NULL;
@@ -223,7 +221,7 @@ int osd_Slider( vlc_object_t *p_this, spu_t *p_spu,
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 );
+ p_subpic = osd_CreateWidget( i_channel );
if( p_subpic == NULL )
{
return VLC_EGENERIC;
@@ -286,7 +284,7 @@ int osd_Icon( vlc_object_t *p_this, spu_t *p_spu,
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 );
+ p_subpic = osd_CreateWidget( i_channel );
if( p_subpic == NULL )
{
return VLC_EGENERIC;
More information about the vlc-commits
mailing list