diff options
Diffstat (limited to 'player')
-rw-r--r-- | player/command.c | 11 | ||||
-rw-r--r-- | player/osd.c | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/player/command.c b/player/command.c index b5317e1470..c89f6a7f6f 100644 --- a/player/command.c +++ b/player/command.c @@ -13,8 +13,6 @@ * * You should have received a copy of the GNU Lesser General Public * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - * - * Parts under HAVE_GPL are licensed under GNU General Public License. */ #include <stdlib.h> @@ -5002,8 +5000,6 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re break; } -#if HAVE_GPL - // Possibly GPL due to 7a71da01d64374ce22b430590f3df32c881288bd. case MP_CMD_ADD: case MP_CMD_CYCLE: { @@ -5033,14 +5029,12 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re return -1; } else if (r <= 0) { set_osd_msg(mpctx, osdl, osd_duration, - "Failed to increment property '%s' by %g", - property, s.inc); + "Failed to change property '%s'", property); return -1; } } break; } -#endif case MP_CMD_MULTIPLY: { char *property = cmd->args[0].v.s; @@ -5331,8 +5325,6 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re break; } -#if HAVE_GPL - // Possibly GPL due to 2f376d1b39913e8ff4c4499e7cf7148ec331d4db. case MP_CMD_SUB_ADD: case MP_CMD_AUDIO_ADD: { if (!mpctx->playing) @@ -5384,7 +5376,6 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re print_track_list(mpctx, "Track removed:"); break; } -#endif case MP_CMD_SUB_RELOAD: case MP_CMD_AUDIO_RELOAD: { diff --git a/player/osd.c b/player/osd.c index 70dbd1640a..1453c9b599 100644 --- a/player/osd.c +++ b/player/osd.c @@ -13,8 +13,6 @@ * * You should have received a copy of the GNU Lesser General Public * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - * - * Parts under HAVE_GPL are licensed under GNU General Public License. */ #include <stddef.h> @@ -431,14 +429,11 @@ static void sadd_osd_status(char **buffer, struct MPContext *mpctx, int level) talloc_free(text); } else { sadd_hhmmssff(buffer, get_playback_time(mpctx), fractions); -#if HAVE_GPL - // Potentially GPL due to 8d190244d21a4d40bb9e8f7d51aa09ca1888de09. if (level == 3) { saddf(buffer, " / "); sadd_hhmmssff(buffer, get_time_length(mpctx), fractions); sadd_percentage(buffer, get_percent_pos(mpctx)); } -#endif } } } |