No functionnal changes.

osd_widget.c and video_widget.c has been merged.

include/vlc_osd.h

@@ -446,17 +446,6 @@ VLC_EXPORT( int, osd_ShowTextRelative, ( spu_t *, int, const char *, const text_
 VLC_EXPORT( int, osd_ShowTextAbsolute, ( spu_t *, int, const char *, const text_style_t *, int, int, int, mtime_t, mtime_t ) );
 VLC_EXPORT( void, osd_Message, ( spu_t *, int, char *, ... ) LIBVLC_FORMAT( 3, 4 ) );
 
-/**
- * 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, int, int, short ) );
-VLC_EXPORT( int, osd_Icon, ( vlc_object_t *, spu_t *, int, int, int, int, int, short ) );
-
 /** @} */
 
 # ifdef __cplusplus

src/Makefile.am

@@ -394,7 +394,6 @@ SOURCES_libvlc_common = \
 	audio_output/intf.c \
 	osd/osd.c \
 	osd/osd_text.c \
-	osd/osd_widgets.c \
 	network/acl.c \
 	network/getaddrinfo.c \
 	network/io.c \

src/libvlccore.sym

@@ -280,7 +280,6 @@ net_Write
 NTPtime64
 osd_ButtonFind
 osd_ButtonSelect
-osd_Icon
 osd_MenuActivate
 osd_MenuCreate
 osd_MenuDelete
@@ -293,7 +292,6 @@ osd_MenuUp
 osd_Message
 osd_ShowTextAbsolute
 osd_ShowTextRelative
-osd_Slider
 osd_Volume
 path_sanitize
 picture_CopyPixels