osd: remove dead core OSD menu functions

extras/analyser/vlc.vim

@@ -96,9 +96,6 @@ function VlcSyntax()
   syn keyword cType xml_t xml_sys_t xml_reader_t xml_reader_sys_t
   " VoD
   syn keyword cType vod_t vod_sys_t vod_media_t
-  " OSD
-  syn keyword cType osd_menu_t osd_state_t osd_event_t osd_button_t
-  syn keyword cType osd_menu_state_t
   " OpenGL
   syn keyword cType opengl_t opengl_sys_t
   " VLM

include/vlc_common.h

@@ -333,13 +333,6 @@ typedef struct vod_t     vod_t;
 typedef struct vod_sys_t vod_sys_t;
 typedef struct vod_media_t vod_media_t;
 
-/* osdmenu */
-typedef struct osd_menu_t   osd_menu_t;
-typedef struct osd_state_t  osd_state_t;
-typedef struct osd_event_t  osd_event_t;
-typedef struct osd_button_t osd_button_t;
-typedef struct osd_menu_state_t osd_menu_state_t;
-
 /* VLM */
 typedef struct vlm_t         vlm_t;
 typedef struct vlm_message_t vlm_message_t;

po/POTFILES.in

@@ -42,7 +42,6 @@ include/vlc_modules.h
 include/vlc_mtime.h
 include/vlc_network.h
 include/vlc_objects.h
-include/vlc_osd.h
 include/vlc_pgpkey.h
 include/vlc_playlist.h
 include/vlc_plugin.h
@@ -135,7 +134,6 @@ src/network/rootbind.c
 src/network/tcp.c
 src/network/tls.c
 src/network/udp.c
-src/osd/osd.c
 src/playlist/control.c
 src/playlist/engine.c
 src/playlist/item.c

src/Makefile.am

@@ -107,7 +107,6 @@ noinst_HEADERS = \
 	../include/vlc_intf_strings.h \
 	../include/vlc_iso_lang.h \
 	../include/vlc_memory.h \
-	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
@@ -245,10 +244,6 @@ if ENABLE_VLM
 libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
 endif
 endif
-if BUILD_OSDMENU
-libvlccore_la_SOURCES += osd/osd.c
-AM_CPPFLAGS += -DOSDMENU
-endif
 
 SOURCES_libvlc_darwin = \
 	posix/darwin_dirs.c \

src/libvlccore.sym

@@ -275,17 +275,6 @@ net_SetCSCov
 net_vaPrintf
 net_Write
 NTPtime64
-osd_ButtonFind
-osd_ButtonSelect
-osd_MenuActivate
-osd_MenuCreate
-osd_MenuDelete
-osd_MenuDown
-osd_MenuHide
-osd_MenuNext
-osd_MenuPrev
-osd_MenuShow
-osd_MenuUp
 path_sanitize
 picture_BlendSubpicture
 picture_CopyPixels

src/missing.c

@@ -439,67 +439,3 @@ ml_person_t*  ml_GetPersonsFromMedia( media_library_t* p_ml,
     return NULL;
 }
 #endif /* !MEDIA_LIBRARY */
-
-#ifndef OSDMENU
-# include <vlc_osd.h>
-
-osd_menu_t *(osd_MenuCreate) (vlc_object_t *obj, const char *file)
-{
-    msg_Err (obj, "OSD menu not supported: %s", file);
-    return NULL;
-}
-
-void (osd_MenuDelete) (vlc_object_t *obj, osd_menu_t *osd)
-{
-    (void) obj; (void) osd;
-    assert (0);
-}
-
-void (osd_MenuShow) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-void (osd_MenuHide) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-void (osd_MenuActivate) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-void (osd_MenuNext) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-void (osd_MenuPrev) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-void (osd_MenuUp) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-void (osd_MenuDown) (vlc_object_t *obj)
-{
-    msg_Err (obj, "OSD menu not supported");
-}
-
-osd_button_t *(osd_ButtonFind) (vlc_object_t *obj, int x, int y,
-                                int wh, int ww, int sw, int sh)
-{
-    (void) obj; (void) x; (void) y; (void) wh; (void) ww; (void) sw; (void) sh;
-    return NULL;
-}
-
-void (osd_ButtonSelect) (vlc_object_t *obj, osd_button_t *btn)
-{
-    (void) obj; (void) btn;
-    assert (0);
-}
-#endif