libmenu: remove OSD menu functionality (--menu)

Something like the OSD menu functionality could be useful. However the
current implementation has several problems and would require a
relatively large amount of work to get into good shape. As far as I
know there are few users of the existing functionality. Nobody is
working on the existing code and keeping it compiling at all while
changing other code would require extra work. So delete the menu code
and some related code elsewhere that's used by nothing else.

Author: Uoti Urpala

DOCS/tech/slave.txt

@@ -199,17 +199,6 @@ loop <value> [abs]
     Adjust/set how many times the movie should be looped. -1 means no loop,
     and 0 forever.
 
-menu <command>
-    Execute an OSD menu command.
-        up     Move cursor up.
-        down   Move cursor down.
-        ok     Accept selection.
-        cancel Cancel selection.
-        hide   Hide the OSD menu.
-
-set_menu <menu_name>
-    Display the menu named <menu_name>.
-
 mute [value]
     Toggle sound output muting or set it to [value] when [value] >= 0
     (1 == on, 0 == off).
@@ -269,6 +258,9 @@ radio_step_channel <-1|1>
 radio_step_freq <value>
     Tune frequency by the <value> (positive - up, negative - down).
 
+run <value>
+    Run <value> as shell command.
+
 seek <value> [type] [hr-seek]
     Seek to some place in the movie.
         type = 0 is a relative seek of +/- <value> seconds (default).
@@ -495,23 +487,6 @@ volume <value> [abs]
     Increase/decrease volume or set it to <value> if [abs] is nonzero.
 
 
-The following commands are really only useful for OSD menu console mode:
-
-help
-    Displays help text, currently empty.
-
-exit
-    Exits from OSD menu console. Unlike 'quit', does not quit MPlayer.
-
-hide
-    Hides the OSD menu console. Clicking a menu command unhides it. Other
-    keybindings act as usual.
-
-run <value>
-    Run <value> as shell command. In OSD menu console mode stdout and stdin
-    are through the video output driver.
-
-
 Available properties:
 
 name               type      min     max     get set step comment

Makefile

@@ -466,18 +466,6 @@ SRCS_MPLAYER-$(JOYSTICK)     += input/joystick.c
 SRCS_MPLAYER-$(JPEG)         += libvo/vo_jpeg.c
 SRCS_MPLAYER-$(KAI)          += libao2/ao_kai.c
 SRCS_MPLAYER-$(KVA)          += libvo/vo_kva.c
-SRCS_MPLAYER-$(LIBMENU)      += libmenu/menu.c \
-                                libmenu/menu_chapsel.c \
-                                libmenu/menu_cmdlist.c  \
-                                libmenu/menu_console.c \
-                                libmenu/menu_filesel.c \
-                                libmenu/menu_list.c  \
-                                libmenu/menu_param.c \
-                                libmenu/menu_pt.c \
-                                libmenu/menu_txt.c \
-                                libmenu/vf_menu.c \
-
-SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
 SRCS_MPLAYER-$(LIRC)          += input/lirc.c
 SRCS_MPLAYER-$(MD5SUM)        += libvo/vo_md5sum.c
 SRCS_MPLAYER-$(MGA)           += libvo/vo_mga.c
@@ -555,7 +543,6 @@ DIRS =  . \
         libdvdnav \
         libdvdnav/vm \
         libdvdread4 \
-        libmenu \
         libmpcodecs \
         libmpcodecs/native \
         libmpdemux \

cfg-mplayer.h

@@ -44,13 +44,6 @@ extern char *lirc_configfile;
 extern char *vo_geometry;
 extern int stop_xscreensaver;
 
-extern int menu_startup;
-extern int menu_keepdir;
-extern char *menu_chroot;
-extern char *menu_fribidi_charset;
-extern int menu_flip_hebrew;
-extern int menu_fribidi_flip_commas;
-
 extern char *unrar_executable;
 
 extern char *mp_msg_charset;
@@ -321,7 +314,6 @@ const m_option_t msgl_config[]={
     { "afilter", &mp_msg_levels[MSGT_AFILTER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
     { "netst", &mp_msg_levels[MSGT_NETST], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
     { "muxer", &mp_msg_levels[MSGT_MUXER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
-    { "osd-menu", &mp_msg_levels[MSGT_OSD_MENU], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
     { "identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
     { "ass", &mp_msg_levels[MSGT_ASS], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
     { "statusline", &mp_msg_levels[MSGT_STATUSLINE], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
@@ -362,7 +354,6 @@ const m_option_t msgl_config[]={
     "   sws\n"
     "   vobsub\n"
     "   subreader\n"
-    "   osd-menu   - OSD menu messages\n"
     "   afilter    - Audio filter messages\n"
     "   netst      - Netstream\n"
     "   muxer      - muxer layer\n"
@@ -854,24 +845,6 @@ const m_option_t mplayer_opts[]={
     OPT_INTRANGE("osdlevel", osd_level, 0, 0, 3),
     OPT_INTRANGE("osd-duration", osd_duration, 0, 0, 3600000),
     OPT_INTRANGE("osd-fractions", osd_fractions, 0, 0, 2),
-#ifdef CONFIG_MENU
-    {"menu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-    {"nomenu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
-    {"menu-root", &menu_root, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
-    {"menu-cfg", &menu_cfg, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
-    {"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-    {"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-    {"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#ifdef CONFIG_FRIBIDI
-    {"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-    {"menu-noflip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-    {"menu-flip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-    {"menu-noflip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#endif /* CONFIG_FRIBIDI */
-#else
-    {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL},
-#endif /* CONFIG_MENU */
 
     OPT_STRING("vobsub", vobsub_name, 0),
     {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},

command.c

@@ -66,14 +66,11 @@
 #endif
 #include "stream/stream_dvdnav.h"
 #include "m_struct.h"
-#include "libmenu/menu.h"
 
 #include "mp_core.h"
 #include "mp_fifo.h"
 #include "libavutil/avstring.h"
 
-extern int use_menu;
-
 static void rescale_input_coordinates(struct MPContext *mpctx, int ix, int iy,
                                       double *dx, double *dy)
 {
@@ -2979,10 +2976,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
         add_step_frame(mpctx);
         break;
 
-    case MP_CMD_FILE_FILTER:
-        file_filter = cmd->args[0].v.i;
-        break;
-
     case MP_CMD_QUIT:
         exit_player_with_rc(mpctx, EXIT_QUIT,
                             (cmd->nargs > 0) ? cmd->args[0].v.i : 0);
@@ -3556,10 +3549,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
                 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration,
                             "Selected button number %d", button);
         }
-#endif
-#ifdef CONFIG_MENU
-        if (use_menu && dx >= 0.0 && dy >= 0.0)
-            menu_update_mouse_pos(dx, dy);
 #endif
         break;
     }

configure

@@ -334,7 +334,6 @@ Optional features:
   --disable-freetype     disable FreeType 2 font rendering [autodetect]
   --disable-fontconfig   disable fontconfig font lookup [autodetect]
   --disable-unrarexec    disable using of UnRAR executable [enabled]
-  --enable-menu          enable OSD menu (not DVD menu) [disabled]
   --disable-sortsub      disable subtitle sorting [enabled]
   --enable-fribidi       enable the FriBiDi libs [autodetect]
   --disable-enca         disable ENCA charset oracle library [autodetect]
@@ -678,7 +677,6 @@ _big_endian=auto
 _bitmap_font=yes
 _freetype=auto
 _fontconfig=auto
-_menu=no
 _qtx=auto
 _coreaudio=auto
 _corevideo=auto
@@ -1110,9 +1108,6 @@ for ac_option do
   --enable-dga2) _dga2=yes ;;
   --disable-dga2) _dga2=no ;;
 
-  --enable-menu) _menu=yes ;;
-  --disable-menu) _menu=no ;;
-
   --enable-qtx) _qtx=yes ;;
   --disable-qtx) _qtx=no ;;
 
@@ -6388,17 +6383,6 @@ fi
 echores "$_vstream"
 
 
-echocheck "OSD menu"
-if test "$_menu" = yes ; then
-    def_menu='#define CONFIG_MENU 1'
-    test $_dvbin = "yes" && _menu_dvbin=yes
-else
-def_menu='#undef CONFIG_MENU'
-    _menu_dvbin=no
-fi
-echores "$_menu"
-
-
 echocheck "Subtitles sorting"
 if test "$_sortsub" = yes ; then
     def_sortsub='#define CONFIG_SORTSUB 1'
@@ -6716,8 +6700,6 @@ LIBDCA = $_libdca
 LIBDV = $_libdv
 LIBDVDCSS_INTERNAL = $_libdvdcss_internal
 LIBMAD = $_mad
-LIBMENU = $_menu
-LIBMENU_DVBIN = $_menu_dvbin
 LIBNEMESI = $_nemesi
 LIBNUT = $_libnut
 LIBSMBCLIENT = $_smb
@@ -6938,7 +6920,6 @@ $def_charset
 $def_crash_debug
 $def_debug
 $def_fastmemcpy
-$def_menu
 $def_runtime_cpudetection
 $def_sighandler
 $def_sortsub
@@ -7245,9 +7226,10 @@ skipping autodetection. This behavior is unlike what you may be used to from
 autoconf-based configure scripts that can decide to override you. This greater
 level of control comes at a price. You may have to provide the correct compiler
 and linker flags yourself.
-If you used one of these options (except --enable-menu and similar ones that
-turn on internal features) and experience a compilation or linking failure,
-make sure you have passed the necessary compiler/linker flags to configure.
+If you used one of these options (except --enable-runtime-cpudetection and
+similar ones that turn on internal features) and experience a compilation or
+linking failure, make sure you have passed the necessary compiler/linker flags
+to configure.
 
 If you suspect a bug, please read DOCS/HTML/$language_doc/bugreports.html.