summaryrefslogtreecommitdiffstats
path: root/player/osd.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-23 14:27:53 +0200
committerwm4 <wm4@nowhere>2017-06-23 14:27:53 +0200
commit6ddd95fd6a66ebc8d52f416b13e18433fa0ec488 (patch)
tree998f70fef4e86018fc0e08c35f5911148c069604 /player/osd.c
parentee21bd1baa51d9e6c1cb8c0e05f6d13957d7c93e (diff)
downloadmpv-6ddd95fd6a66ebc8d52f416b13e18433fa0ec488.tar.bz2
mpv-6ddd95fd6a66ebc8d52f416b13e18433fa0ec488.tar.xz
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.
Diffstat (limited to 'player/osd.c')
-rw-r--r--player/osd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/player/osd.c b/player/osd.c
index 75f4cdcf7b..67f2d05298 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -441,6 +441,8 @@ static void sadd_osd_status(char **buffer, struct MPContext *mpctx, int level)
talloc_free(text);
} else {
sadd_hhmmssff_u(buffer, get_playback_time(mpctx), fractions);
+#if HAVE_GPL
+ // Potentially GPL due to 8d190244d21a4d40bb9e8f7d51aa09ca1888de09.
if (level == 3) {
double len = get_time_length(mpctx);
if (len >= 0) {
@@ -449,6 +451,7 @@ static void sadd_osd_status(char **buffer, struct MPContext *mpctx, int level)
}
sadd_percentage(buffer, get_percent_pos(mpctx));
}
+#endif
}
}
}