Changeset a92603f2093140f93c34f301a22eb5763abc4232

Timestamp:

27/08/05 18:40:23 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1125160823 +0000

git-parent:

[89ae1690f9c9bcc71d45c30da3938ece83dd1e5a]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1125160823 +0000

Message:

Merged OSD functionality on the same core functions. All OSD functionality is described in include/vlc_osd.h now, which entirely replace include/osd.h. The file src/video_output/video_widgets.c uses functionality from src/osd/osd_widgets.c now.

Files:

• Makefile.am (modified) (2 diffs)
• include/osd.h (deleted)
• include/vlc_osd.h (modified) (4 diffs)
• include/vlc_symbols.h (modified) (14 diffs)
• include/vlc_video.h (modified) (1 diff)
• modules/access_filter/record.c (modified) (1 diff)
• modules/codec/cmml/cmml.c (modified) (1 diff)
• modules/codec/cmml/intf.c (modified) (1 diff)
• modules/codec/subsdec.c (modified) (1 diff)
• modules/control/corba/mediacontrol-core.c (modified) (1 diff)
• modules/control/hotkeys.c (modified) (2 diffs)
• modules/gui/macosx/controls.m (modified) (1 diff)
• modules/gui/macosx/playlist.m (modified) (2 diffs)
• modules/misc/freetype.c (modified) (1 diff)
• modules/misc/svg.c (modified) (1 diff)
• modules/misc/win32text.c (modified) (1 diff)
• modules/stream_out/transcode.c (modified) (1 diff)
• modules/video_filter/logo.c (modified) (1 diff)
• modules/video_filter/marq.c (modified) (1 diff)
• modules/video_filter/osdmenu.c (modified) (1 diff)
• modules/video_filter/rss.c (modified) (1 diff)
• modules/video_filter/time.c (modified) (1 diff)
• src/control/audio_video.c (modified) (1 diff)
• src/control/core.c (modified) (1 diff)
• src/control/util.c (modified) (1 diff)
• src/misc/modules.c (modified) (1 diff)
• src/osd/osd_text.c (added)
• src/osd/osd_widgets.c (added)
• src/video_output/video_text.c (modified) (2 diffs)
• src/video_output/video_widgets.c (modified) (4 diffs)

Makefile.am

@@ -87 +87 @@
-    include/mtime.h \
-    include/network.h \
-    include/osd.h \
-    include/os_specific.h \
-    include/snapshot.h \
@@ -431 +430 @@
-    src/osd/osd.c \
-    src/osd/osd_parser.c \
+    src/osd/osd_text.c \
+    src/osd/osd_widgets.c \
-    src/misc/charset.c \
-    src/misc/httpd.c \

include/vlc_osd.h

@@ -1 +1 @@
-/*****************************************************************************
-
+vlc_
- *****************************************************************************
- * Copyright (C) 2004-2005 M2X
-
+vlc_
- *
- * Authors: Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
+ *
+ * Added code from include/osd.h written by:
+ * Copyright (C) 2003-2005 the VideoLAN team
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -64 +68 @@
-
-/**
-
+\brief 
- *
- * The configuration file syntax is very basic and so is its parser. See the
@@ -97 +101 @@
-
-/**
+ * OSD menu position and picture type defines
+ */
+
+#define OSD_ALIGN_LEFT 0x1
+#define OSD_ALIGN_RIGHT 0x2
+#define OSD_ALIGN_TOP 0x4
+#define OSD_ALIGN_BOTTOM 0x8
+
+#define OSD_HOR_SLIDER 1
+#define OSD_VERT_SLIDER 2
+
+#define OSD_PLAY_ICON 1
+#define OSD_PAUSE_ICON 2
+#define OSD_SPEAKER_ICON 3
+#define OSD_MUTE_ICON 4
+
+/**
+ * Text style information.
+ * This struct is currently ignored
+ */
+struct text_style_t
+{
+    int i_size;
+    uint32_t i_color;
+    vlc_bool_t b_italic;
+    vlc_bool_t b_bold;
+    vlc_bool_t b_underline;
+};
+static const text_style_t default_text_style = { 22, 0xffffff, VLC_FALSE, VLC_FALSE, VLC_FALSE };
+ 
+/**
- * OSD menu button states
- *
@@ -374 +409 @@
-
-/**
+ * Textual feedback
+ *
+ * Functions that provide the textual feedback on the OSD. They are shown on hotkey commands. The feedback
+ * is also part of the osd_button_t object. The types are declared in the include file
+ * include/vlc_osd.h
+ * @see vlc_osd.h 
+ */
+VLC_EXPORT( int, osd_ShowTextRelative, ( spu_t *, int, char *, text_style_t *, int, int, int, mtime_t ) );
+VLC_EXPORT( int, osd_ShowTextAbsolute, ( spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t ) );
+VLC_EXPORT( void,osd_Message, ( spu_t *, int, char *, ... ) );
+
+/**
+ * Default feedback images
+ *
+ * Functions that provide the default OSD feedback images on hotkey commands. These feedback
+ * images are also part of the osd_button_t object. The types are declared in the include file
+ * include/vlc_osd.h
+ * @see vlc_osd.h 
+ */
+VLC_EXPORT( int, osd_Slider, ( vlc_object_t *, spu_t *, int, int, int, int, short ) );
+VLC_EXPORT( int, osd_Icon, ( vlc_object_t *, spu_t *, int, int, int, short ) );
+
+/**
- * Loading and parse the OSD Configuration file
- *

include/vlc_symbols.h

@@ -23 +23 @@
-int vlm_ScheduleSetup (vlm_schedule_t *, char *, char *);
-vlc_acl_t * __ACL_Duplicate (vlc_object_t *p_this, const vlc_acl_t *p_acl);
+int osd_Slider (vlc_object_t *, spu_t *, int, int, int, int, short);
-int playlist_ServicesDiscoveryRemove (playlist_t *, const char *);
-int playlist_NodeDelete (playlist_t *, playlist_item_t *, vlc_bool_t , vlc_bool_t);
@@ -53 +54 @@
-void * vlc_readdir (void *);
-int sout_AnnounceRegister (sout_instance_t *,session_descriptor_t*, announce_method_t*);
+int osd_ShowTextRelative (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t);
-void * __vlc_object_get (vlc_object_t *, int);
-void vout_SynchroTrash (vout_synchro_t *);
@@ -66 +68 @@
-int playlist_LockItemToNode (playlist_t *,playlist_item_t *);
-void spu_Destroy (spu_t *);
+int osd_Icon (vlc_object_t *, spu_t *, int, int, int, short);
-char* httpd_ServerIP (httpd_client_t *cl, char *psz_ip);
-int spu_Init (spu_t *);
@@ -158 +161 @@
-int vlm_MediaSetup (vlm_t *, vlm_media_t *, char *, char *);
-void sout_StreamDelete (sout_stream_t *);
+int vout_ShowTextAbsolute (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
-void __osd_MenuDelete (vlc_object_t *, osd_menu_t *);
-int vout_ShowTextAbsolute (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
-int sout_AnnounceUnRegister (sout_instance_t *,session_descriptor_t*);
-vlc_bool_t vlc_ureduce (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t);
@@ -177 +180 @@
-char * vlc_strdup (const char *s);
-playlist_item_t* __playlist_ItemNew (vlc_object_t *,const char *,const char *);
+int __net_OpenTCP (vlc_object_t *p_this, const char *psz_host, int i_port);
-int __var_Get (vlc_object_t *, const char *, vlc_value_t *);
-int __net_OpenTCP (vlc_object_t *p_this, const char *psz_host, int i_port);
-void tls_ServerDelete (tls_server_t *);
-unsigned int aout_FormatNbChannels (const audio_sample_format_t * p_format);
@@ -246 +249 @@
-void httpd_StreamDelete (httpd_stream_t *);
-image_handler_t * __image_HandlerCreate (vlc_object_t *);
+void vout_OSDSlider (vlc_object_t *, int, int , short);
-aout_buffer_t * aout_DecNewBuffer (aout_instance_t *, aout_input_t *, size_t);
-void vout_OSDSlider (vlc_object_t *, int, int , short);
-int vout_ChromaCmp (uint32_t, uint32_t);
-int sout_InputDelete (sout_packetizer_input_t *);
@@ -281 +284 @@
-int input_Control (input_thread_t *, int i_query, ...);
-int __aout_VolumeUp (vlc_object_t *, int, audio_volume_t *);
+void osd_Message (spu_t *, int, char *, ...);
-vout_thread_t * __vout_Request (vlc_object_t *, vout_thread_t *, video_format_t *);
-void __osd_MenuUp (vlc_object_t *);
@@ -373 +377 @@
-void __config_PutPsz (vlc_object_t *, const char *, const char *);
-vlm_schedule_t * vlm_ScheduleNew (vlm_t *, char *);
+int osd_ShowTextAbsolute (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
-void net_Close (int fd);
-int __vlc_threads_init (vlc_object_t *);
@@ -809 +814 @@
-    int (*vlc_alphasort_inner) (const struct dirent **a, const struct dirent **b);
-    osd_state_t * (*__osd_StateChange_inner) (osd_state_t *, const int);
-void *osd_Slider_deprecated
+int (*osd_Slider_inner) (vlc_object_t *, spu_t *, int, int, int, int, short)
-    void (*osd_ConfigUnload_inner) (vlc_object_t *, osd_menu_t **);
-    void (*__osd_MenuShow_inner) (vlc_object_t *);
-void *osd_Icon_deprecated
+int (*osd_Icon_inner) (vlc_object_t *, spu_t *, int, int, int, short)
-    void *__osd_VolumeDown_deprecated;
-    void (*__osd_MenuNext_inner) (vlc_object_t *);
@@ -840 +845 @@
-    int (*__vlc_execve_inner) (vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data);
-    httpd_handler_t * (*httpd_HandlerNew_inner) (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *);
+    int (*osd_ShowTextRelative_inner) (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t);
+    void (*osd_Message_inner) (spu_t *, int, char *, ...);
+    int (*osd_ShowTextAbsolute_inner) (spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t);
-};
-#  if defined (__PLUGIN__)
@@ -1216 +1224 @@
-#  define vlc_alphasort (p_symbols)->vlc_alphasort_inner
-#  define __osd_StateChange (p_symbols)->__osd_StateChange_inner
+#  define osd_Slider (p_symbols)->osd_Slider_inner
-#  define osd_ConfigUnload (p_symbols)->osd_ConfigUnload_inner
-#  define __osd_MenuShow (p_symbols)->__osd_MenuShow_inner
+#  define osd_Icon (p_symbols)->osd_Icon_inner
-#  define __osd_MenuNext (p_symbols)->__osd_MenuNext_inner
-#  define __osd_MenuDelete (p_symbols)->__osd_MenuDelete_inner
@@ -1242 +1252 @@
-#  define __vlc_execve (p_symbols)->__vlc_execve_inner
-#  define httpd_HandlerNew (p_symbols)->httpd_HandlerNew_inner
+#  define osd_ShowTextRelative (p_symbols)->osd_ShowTextRelative_inner
+#  define osd_Message (p_symbols)->osd_Message_inner
+#  define osd_ShowTextAbsolute (p_symbols)->osd_ShowTextAbsolute_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1621 +1634 @@
-    ((p_symbols)->vlc_alphasort_inner) = vlc_alphasort; \
-    ((p_symbols)->__osd_StateChange_inner) = __osd_StateChange; \
+    ((p_symbols)->osd_Slider_inner) = osd_Slider; \
-    ((p_symbols)->osd_ConfigUnload_inner) = osd_ConfigUnload; \
-    ((p_symbols)->__osd_MenuShow_inner) = __osd_MenuShow; \
+    ((p_symbols)->osd_Icon_inner) = osd_Icon; \
-    ((p_symbols)->__osd_MenuNext_inner) = __osd_MenuNext; \
-    ((p_symbols)->__osd_MenuDelete_inner) = __osd_MenuDelete; \
@@ -1647 +1662 @@
-    ((p_symbols)->__vlc_execve_inner) = __vlc_execve; \
-    ((p_symbols)->httpd_HandlerNew_inner) = httpd_HandlerNew; \
+    ((p_symbols)->osd_ShowTextRelative_inner) = osd_ShowTextRelative; \
+    ((p_symbols)->osd_Message_inner) = osd_Message; \
+    ((p_symbols)->osd_ShowTextAbsolute_inner) = osd_ShowTextAbsolute; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->vlc_fix_readdir_charset_deprecated = NULL; \
-    (p_symbols)->osd_Slider_deprecated = NULL; \
-    (p_symbols)->osd_Icon_deprecated = NULL; \
-    (p_symbols)->__osd_VolumeDown_deprecated = NULL; \
-    (p_symbols)->__osd_VolumeUp_deprecated = NULL; \

include/vlc_video.h

@@ -348 +348 @@
-VLC_EXPORT( int, __vout_AllocatePicture,( vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_aspect ) );
-
+/**
+ * vout_ShowTextRelative
+ *
+ * Show text on the video for some time
+ * \param p_vout pointer to the vout the text is to be showed on
+ * \param i_channel Subpicture channel
+ * \param psz_string The text to be shown
+ * \param p_style Pointer to a struct with text style info
+ * \param i_flags flags for alignment and such
+ * \param i_hmargin horizontal margin in pixels
+ * \param i_vmargin vertical margin in pixels
+ * \param i_duration Amount of time the text is to be shown.
+ */
+VLC_EXPORT( int, vout_ShowTextRelative, ( vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t ) );
+
+/**
+ * vout_ShowTextAbsolute
+ *
+ * Show text on the video from a given start date to a given end date
+ * \param p_vout pointer to the vout the text is to be showed on
+ * \param i_channel Subpicture channel
+ * \param psz_string The text to be shown
+ * \param p_style Pointer to a struct with text style info
+ * \param i_flags flags for alignment and such
+ * \param i_hmargin horizontal margin in pixels
+ * \param i_vmargin vertical margin in pixels
+ * \param i_start the time when this string is to appear on the video
+ * \param i_stop the time when this string should stop to be displayed
+ *               if this is 0 the string will be shown untill the next string
+ *               is about to be shown
+ */
+VLC_EXPORT( int, vout_ShowTextAbsolute, ( vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t ) );
+
+/**
+ * vout_OSDMessage
+ *
+ * Write an informative message at the default location,
+ * for the default duration and only if the OSD option is enabled.
+ * \param p_caller The object that called the function.
+ * \param i_channel Subpicture channel
+ * \param psz_format printf style formatting
+ **/
+VLC_EXPORT( void,  __vout_OSDMessage, ( vlc_object_t *, int, char *, ... ) );
+
+/**
+ * Same as __vlc_OSDMessage() but with automatic casting
+ */
+#if defined(HAVE_VARIADIC_MACROS)
+#    define vout_OSDMessage( obj, chan, fmt, args...) __vout_OSDMessage( VLC_OBJECT(obj), chan, fmt, ## args )
+#else
+#    define vout_OSDMessage __vout_OSDMessage
+#endif
+
+/**
+ * vout_OSDSlider
+ *
+ * Display a slider on the video output.
+ * \param p_this    The object that called the function.
+ * \param i_channel Subpicture channel
+ * \param i_postion Current position in the slider
+ * \param i_type    Types are: OSD_HOR_SLIDER and OSD_VERT_SLIDER.
+ * @see vlc_osd.h
+ */
+VLC_EXPORT( void, vout_OSDSlider, ( vlc_object_t *, int, int , short ) );
+
+/**
+ * vout_OSDIcon
+ *
+ * Display an Icon on the video output.
+ * \param p_this    The object that called the function.
+ * \param i_channel Subpicture channel
+ * \param i_type    Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON, OSD_SPEAKER_ICON, OSD_MUTE_ICON
+ * @see vlc_osd.h
+ */
+VLC_EXPORT( void, vout_OSDIcon, ( vlc_object_t *, int, short ) );
+
-/**@}*/
-

modules/access_filter/record.c

@@ -32 +32 @@
-
-#include "vlc_keys.h"
-
+vlc_
-#include <errno.h>
-#include <time.h>

modules/codec/cmml/cmml.c

@@ -32 +32 @@
-#include <vlc/intf.h>
-
-
+vlc_
-
-#include "charset.h"

modules/codec/cmml/intf.c

@@ -42 +42 @@
-#include <vlc/vout.h>
-
-
+vlc_
-
-#include "vlc_keys.h"

modules/codec/subsdec.c

@@ -30 +30 @@
-#include <vlc/decoder.h>
-
-
+vlc_
-#include "vlc_filter.h"
-

modules/control/corba/mediacontrol-core.c

@@ -6 +6 @@
-#include <vlc_demux.h>
-
-
+vlc_
-
-#define HAS_SNAPSHOT 1

modules/control/hotkeys.c

@@ -33 +33 @@
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-
+vlc_
-
-#include "vlc_keys.h"
@@ -244 +244 @@
-            if( p_hotkeys[i].i_key == i_key )
-            {
- 
- 
-       
+
+
+                
-            }
-        }

modules/gui/macosx/controls.m

@@ -35 +35 @@
-#include "open.h"
-#include "controls.h"
-
+vlc_
-
-/*****************************************************************************

modules/gui/macosx/playlist.m

@@ -50 +50 @@
-#include "playlist.h"
-#include "controls.h"
-
+vlc_
-#include "misc.h"
-
@@ -1608 +1608 @@
-#endif
-    /* We add the "VLCPlaylistItemPboardType" type to be able to recognize
-
+n
-       We need to add NSFilenamesPboardType otherwise the outlineview refuses
-       to the drop. */

modules/misc/freetype.c

@@ -35 +35 @@
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-
+vlc_
-#include "vlc_block.h"
-#include "vlc_filter.h"

modules/misc/svg.c

@@ -34 +34 @@
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-
+vlc_
-#include "vlc_block.h"
-#include "vlc_filter.h"

modules/misc/win32text.c

@@ -30 +30 @@
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-
+vlc_
-#include "vlc_block.h"
-#include "vlc_filter.h"

modules/stream_out/transcode.c

@@ -37 +37 @@
-#include <vlc/decoder.h>
-#include "vlc_filter.h"
-
+vlc_
-
-#define MASTER_SYNC_MAX_DRIFT 100000

modules/video_filter/logo.c

@@ -35 +35 @@
-#include "filter_common.h"
-#include "vlc_image.h"
-
+vlc_
-
-#ifdef LoadImage

modules/video_filter/marq.c

@@ -33 +33 @@
-#include "vlc_filter.h"
-#include "vlc_block.h"
-
+vlc_
-
-/*****************************************************************************

modules/video_filter/osdmenu.c

@@ -33 +33 @@
-#include <vlc_video.h>
-
-#include <osd.h>
-#include <vlc_osd.h>
-

modules/video_filter/rss.c

@@ -33 +33 @@
-#include "vlc_filter.h"
-#include "vlc_block.h"
-
+vlc_
-
-#include "vlc_block.h"

modules/video_filter/time.c

@@ -35 +35 @@
-#include "vlc_filter.h"
-#include "vlc_block.h"
-
+vlc_
-
-/*****************************************************************************

src/control/audio_video.c

@@ -29 +29 @@
-#include <vlc_demux.h>
-
-
+vlc_
-
-#define HAS_SNAPSHOT 1

src/control/core.c

@@ -29 +29 @@
-#include <vlc_demux.h>
-
-
+vlc_
-
-#define HAS_SNAPSHOT 1

src/control/util.c

@@ -29 +29 @@
-#include <vlc_demux.h>
-
-
+vlc_
-
-#define HAS_SNAPSHOT 1

src/misc/modules.c

@@ -93 +93 @@
-
-#include "stream_output.h"
-#include "osd.h"
-#include "vlc_httpd.h"
-#include "vlc_acl.h"

src/video_output/video_text.c

@@ -22 +22 @@
- *****************************************************************************/
-#include <vlc/vout.h>
-"vlc_block.h"
-"vlc_filter.h"
-"osd.h"
+<vlc_block.h>
+<vlc_filter.h>
+<vlc_osd.h>
-
-/**
@@ -124 +124 @@
-
-    p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-
-    if( p_vout )
-    {

src/video_output/video_widgets.c

@@ -2 +2 @@
- * video_widgets.c : OSD widgets manipulation functions
- *****************************************************************************
-
+-2005
- * $Id$
- *
@@ -27 +27 @@
-#include <stdlib.h>                                                /* free() */
-#include <vlc/vout.h>
-
+vlc_
-
-#include "vlc_video.h"
-#include "vlc_filter.h"
-
-#define STYLE_EMPTY 0
-#define STYLE_FILLED 1
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void DrawRect( subpicture_t *, int, int, int, int, short );
-static void DrawTriangle( subpicture_t *, int, int, int, int, short );
-static void CreatePicture( spu_t *, subpicture_t *, int, int, int, int );
-static subpicture_t *vout_CreateWidget( spu_t *, int );
-
-/*****************************************************************************
- * Draws a rectangle at the given position in the subpic.
- * It may be filled (fill == STYLE_FILLED) or empty (fill == STYLE_EMPTY).
- *****************************************************************************/
-static void DrawRect( subpicture_t *p_subpic, int i_x1, int i_y1,
-                      int i_x2, int i_y2, short fill )
-{
-    int x, y;
-    uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
-    int i_pitch = p_subpic->p_region->picture.Y_PITCH;
-
-    if( fill == STYLE_FILLED )
-    {
-        for( y = i_y1; y <= i_y2; y++ )
-        {
-            for( x = i_x1; x <= i_x2; x++ )
-            {
-                p_a[ x + i_pitch * y ] = 0xff;
-            }
-        }
-    }
-    else
-    {
-        for( y = i_y1; y <= i_y2; y++ )
-        {
-            p_a[ i_x1 + i_pitch * y ] = 0xff;
-            p_a[ i_x2 + i_pitch * y ] = 0xff;
-        }
-        for( x = i_x1; x <= i_x2; x++ )
-        {
-            p_a[ x + i_pitch * i_y1 ] = 0xff;
-            p_a[ x + i_pitch * i_y2 ] = 0xff;
-        }
-    }
-}
-
-/*****************************************************************************
- * Draws a triangle at the given position in the subpic.
- * It may be filled (fill == STYLE_FILLED) or empty (fill == STYLE_EMPTY).
- *****************************************************************************/
-static void DrawTriangle( subpicture_t *p_subpic, int i_x1, int i_y1,
-                          int i_x2, int i_y2, short fill )
-{
-    int x, y, i_mid, h;
-    uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
-    int i_pitch = p_subpic->p_region->picture.Y_PITCH;
-
-    i_mid = i_y1 + ( ( i_y2 - i_y1 ) >> 1 );
-
-    if( i_x2 >= i_x1 )
-    {
-        if( fill == STYLE_FILLED )
-        {
-            for( y = i_y1; y <= i_mid; y++ )
-            {
-                h = y - i_y1;
-                for( x = i_x1; x <= i_x1 + h && x <= i_x2; x++ )
-                {
-                    p_a[ x + i_pitch * y ] = 0xff;
-                    p_a[ x + i_pitch * ( i_y2 - h ) ] = 0xff;
-                }
-            }
-        }
-        else
-        {
-            for( y = i_y1; y <= i_mid; y++ )
-            {
-                h = y - i_y1;
-                p_a[ i_x1 + i_pitch * y ] = 0xff;
-                p_a[ i_x1 + h + i_pitch * y ] = 0xff;
-                p_a[ i_x1 + i_pitch * ( i_y2 - h ) ] = 0xff;
-                p_a[ i_x1 + h + i_pitch * ( i_y2 - h ) ] = 0xff;
-            }
-        }
-    }
-    else
-    {
-        if( fill == STYLE_FILLED )
-        {
-            for( y = i_y1; y <= i_mid; y++ )
-            {
-                h = y - i_y1;
-                for( x = i_x1; x >= i_x1 - h && x >= i_x2; x-- )
-                {
-                    p_a[ x + i_pitch * y ] = 0xff;
-                    p_a[ x + i_pitch * ( i_y2 - h ) ] = 0xff;
-                }
-            }
-        }
-        else
-        {
-            for( y = i_y1; y <= i_mid; y++ )
-            {
-                h = y - i_y1;
-                p_a[ i_x1 + i_pitch * y ] = 0xff;
-                p_a[ i_x1 - h + i_pitch * y ] = 0xff;
-                p_a[ i_x1 + i_pitch * ( i_y2 - h ) ] = 0xff;
-                p_a[ i_x1 - h + i_pitch * ( i_y2 - h ) ] = 0xff;
-            }
-        }
-    }
-}
-
-/*****************************************************************************
- * Create Picture: creates subpicture region and picture
- *****************************************************************************/
-static void CreatePicture( spu_t *p_spu, subpicture_t *p_subpic,
-                           int i_x, int i_y, int i_width, int i_height )
-{
-    uint8_t *p_y, *p_u, *p_v, *p_a;
-    video_format_t fmt;
-    int i_pitch;
-
-    /* Create a new subpicture region */
-    memset( &fmt, 0, sizeof(video_format_t) );
-    fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
-    fmt.i_aspect = 0;
-    fmt.i_width = fmt.i_visible_width = i_width;
-    fmt.i_height = fmt.i_visible_height = i_height;
-    fmt.i_x_offset = fmt.i_y_offset = 0;
-    p_subpic->p_region = p_subpic->pf_create_region( VLC_OBJECT(p_spu), &fmt );
-    if( !p_subpic->p_region )
-    {
-        msg_Err( p_spu, "cannot allocate SPU region" );
-        return;
-    }
-
-    p_subpic->p_region->i_x = i_x;
-    p_subpic->p_region->i_y = i_y;
-    p_y = p_subpic->p_region->picture.Y_PIXELS;
-    p_u = p_subpic->p_region->picture.U_PIXELS;
-    p_v = p_subpic->p_region->picture.V_PIXELS;
-    p_a = p_subpic->p_region->picture.A_PIXELS;
-    i_pitch = p_subpic->p_region->picture.Y_PITCH;
-
-    /* Initialize the region pixels (only the alpha will be changed later) */
-    memset( p_y, 0xff, i_pitch * p_subpic->p_region->fmt.i_height );
-    memset( p_u, 0x80, i_pitch * p_subpic->p_region->fmt.i_height );
-    memset( p_v, 0x80, i_pitch * p_subpic->p_region->fmt.i_height );
-    memset( p_a, 0x00, i_pitch * p_subpic->p_region->fmt.i_height );
-}
-
-/*****************************************************************************
- * Creates and initializes an OSD widget.
- *****************************************************************************/
-subpicture_t *vout_CreateWidget( spu_t *p_spu, int i_channel )
-{
-    subpicture_t *p_subpic;
-    mtime_t i_now = mdate();
-
-    /* Create and initialize a subpicture */
-    p_subpic = spu_CreateSubpicture( p_spu );
-    if( p_subpic == NULL ) return NULL;
-
-    p_subpic->i_channel = i_channel;
-    p_subpic->i_start = i_now;
-    p_subpic->i_stop = i_now + 1200000;
-    p_subpic->b_ephemer = VLC_TRUE;
-    p_subpic->b_fade = VLC_TRUE;
-
-    return p_subpic;
-}
-
-/*****************************************************************************
@@ -215 +41 @@
-    vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
-                                             FIND_ANYWHERE );
-
-
-
-
+
-    {
-
+
+
-    }
-    if( !config_GetInt( p_caller, "osd" ) || i_position < 0 )
-    {
-        vlc_object_release( p_vout );
-        return;
-    }
-    p_subpic = vout_CreateWidget( p_vout->p_spu, i_channel );
-    if( p_subpic == NULL )
-    {
-        return;
-    }
-
-    i_y_margin = p_vout->render.i_height / 10;
-    i_x_margin = i_y_margin;
-    if( i_type == OSD_HOR_SLIDER )
-    {
-        i_width = p_vout->render.i_width - 2 * i_x_margin;
-        i_height = p_vout->render.i_height / 20;
-        i_x = i_x_margin;
-        i_y = p_vout->render.i_height - i_y_margin - i_height;
-    }
-    else
-    {
-        i_width = p_vout->render.i_width / 40;
-        i_height = p_vout->render.i_height - 2 * i_y_margin;
-        i_x = p_vout->render.i_width - i_x_margin - i_width;
-        i_y = i_y_margin;
-    }
-
-    /* Create subpicture region and picture */
-    CreatePicture( p_vout->p_spu, p_subpic, i_x, i_y, i_width, i_height );
-
-    if( i_type == OSD_HOR_SLIDER )
-    {
-        int i_x_pos = ( i_width - 2 ) * i_position / 100;
-        DrawRect( p_subpic, i_x_pos - 1, 2, i_x_pos + 1,
-                  i_height - 3, STYLE_FILLED );
-        DrawRect( p_subpic, 0, 0, i_width - 1, i_height - 1, STYLE_EMPTY );
-    }
-    else if( i_type == OSD_VERT_SLIDER )
-    {
-        int i_y_pos = i_height / 2;
-        DrawRect( p_subpic, 2, i_height - ( i_height - 2 ) * i_position / 100,
-                  i_width - 3, i_height - 3, STYLE_FILLED );
-        DrawRect( p_subpic, 1, i_y_pos, 1, i_y_pos, STYLE_FILLED );
-        DrawRect( p_subpic, i_width - 2, i_y_pos,
-                  i_width - 2, i_y_pos, STYLE_FILLED );
-        DrawRect( p_subpic, 0, 0, i_width - 1, i_height - 1, STYLE_EMPTY );
-    }
-
-    spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
-
-    vlc_object_release( p_vout );
-    return;
-}
-
@@ -285 +57 @@
-    vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
-                                             FIND_ANYWHERE );
-
-
-
-
+
-    {
-
+
+
-    }
-
-    p_subpic = vout_CreateWidget( p_vout->p_spu, i_channel );
-    if( p_subpic == NULL )
-    {