RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

input: drop deprecated "osd" command

Browse Source 
Complicated situation due to changes by GPL-only author, but also
unnecessary due to newer mechanisms.
This commit is contained in:
wm4 2017-07-21 20:02:58 +02:00
parent 4bc29c1730
commit a22ff44f7b
4 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOCS/interface-changes.rst
View File

@ -21,6 +21,7 @@ Interface changes
--- mpv 0.27.0 --- --- mpv 0.27.0 ---
- drop previously deprecated --field-dominance option - drop previously deprecated --field-dominance option
- drop previously deprecated "osd" command
--- mpv 0.26.0 --- --- mpv 0.26.0 ---
- remove remaining deprecated audio device options, like --alsa-device - remove remaining deprecated audio device options, like --alsa-device
Some of them were removed in earlier releases. Some of them were removed in earlier releases.

3
input/cmd_list.c
View File

@ -98,9 +98,6 @@ const struct mp_cmd_def mp_cmds[] = {
{ MP_CMD_PLAYLIST_SHUFFLE, "playlist-shuffle", }, { MP_CMD_PLAYLIST_SHUFFLE, "playlist-shuffle", },
{ MP_CMD_SUB_STEP, "sub-step", { ARG_INT }, .allow_auto_repeat = true }, { MP_CMD_SUB_STEP, "sub-step", { ARG_INT }, .allow_auto_repeat = true },
{ MP_CMD_SUB_SEEK, "sub-seek", { ARG_INT }, .allow_auto_repeat = true }, { MP_CMD_SUB_SEEK, "sub-seek", { ARG_INT }, .allow_auto_repeat = true },
#if HAVE_GPL
{ MP_CMD_OSD, "osd", { OARG_INT(-1) } },
#endif
{ MP_CMD_PRINT_TEXT, "print-text", { ARG_STRING }, .allow_auto_repeat = true }, { MP_CMD_PRINT_TEXT, "print-text", { ARG_STRING }, .allow_auto_repeat = true },
{ MP_CMD_SHOW_TEXT, "show-text", { ARG_STRING, OARG_INT(-1), OARG_INT(0) }, { MP_CMD_SHOW_TEXT, "show-text", { ARG_STRING, OARG_INT(-1), OARG_INT(0) },
.allow_auto_repeat = true}, .allow_auto_repeat = true},

1
input/cmd_list.h
View File

@ -46,7 +46,6 @@ enum mp_command_type {
MP_CMD_QUIT_WATCH_LATER, MP_CMD_QUIT_WATCH_LATER,
MP_CMD_PLAYLIST_NEXT, MP_CMD_PLAYLIST_NEXT,
MP_CMD_PLAYLIST_PREV, MP_CMD_PLAYLIST_PREV,
MP_CMD_OSD,
MP_CMD_SCREENSHOT, MP_CMD_SCREENSHOT,
MP_CMD_SCREENSHOT_TO_FILE, MP_CMD_SCREENSHOT_TO_FILE,
MP_CMD_SCREENSHOT_RAW, MP_CMD_SCREENSHOT_RAW,

22
player/command.c
View File

@ -5194,28 +5194,6 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
break; break;
} }
#if HAVE_GPL
// Potentially GPL due to 8d190244d21a4d40bb9e8f7d51aa09ca1888de09.
case MP_CMD_OSD: {
MP_WARN(mpctx, "The 'osd' command is deprecated. "
"Use 'cycle osd-level' instead.\n");
int v = cmd->args[0].v.i;
#define MAX_OSD_LEVEL 3
if (opts->osd_level > MAX_OSD_LEVEL)
opts->osd_level = MAX_OSD_LEVEL;
if (v < 0)
opts->osd_level = (opts->osd_level + 1) % (MAX_OSD_LEVEL + 1);
else
opts->osd_level = MPCLAMP(v, 0, MAX_OSD_LEVEL);
if (opts->osd_level > 0 && (on_osd & MP_ON_OSD_MSG))
set_osd_msg(mpctx, osdl, osd_duration, "OSD level: %d", opts->osd_level);
if (opts->osd_level == 0)
set_osd_msg(mpctx, 0, 0, "");
mp_wakeup_core(mpctx);
break;
}
#endif
case MP_CMD_PRINT_TEXT: { case MP_CMD_PRINT_TEXT: {
MP_INFO(mpctx, "%s\n", cmd->args[0].v.s); MP_INFO(mpctx, "%s\n", cmd->args[0].v.s);
break; break;