From 6ddd95fd6a66ebc8d52f416b13e18433fa0ec488 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 23 Jun 2017 14:27:53 +0200 Subject: player: deprecate "osd" command It was extended by "seru" in 8d190244. This person could not be reached (or does not reply), and it's in the way of LGPL relicensing. Deprecate it, and mark the (probably) affected parts of the code with HAVE_GPL. To be fair, even though the osd.c parts were refactored from the original code, there's probably no copyright by seru on it. But for now play it save. The mere existence of a 3rd OSD level is certainly not copyrightable, so you still can set osd-level to 3 - just that it does nothing. --- player/command.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 3df1b3fcd1..7facb7972e 100644 --- a/player/command.c +++ b/player/command.c @@ -5125,8 +5125,13 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re 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) @@ -5140,6 +5145,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re mp_wakeup_core(mpctx); break; } +#endif case MP_CMD_PRINT_TEXT: { MP_INFO(mpctx, "%s\n", cmd->args[0].v.s); -- cgit v1.2.3