summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-19 13:02:35 +0200
committerwm4 <wm4@nowhere>2017-06-19 13:28:19 +0200
commit2e84934be7d419da91c2bc0682d71087439d66ad (patch)
treeedae221bc812247cb3f1003afd2dc10f4418fc20 /player/command.c
parentab19b3c9d31c5bcff41bab9bf9c39c022e8edf9e (diff)
downloadmpv-2e84934be7d419da91c2bc0682d71087439d66ad.tar.bz2
mpv-2e84934be7d419da91c2bc0682d71087439d66ad.tar.xz
input: change license to LGPL
cehoyos adds the step_property command in 7a71da01d, and it could be argued that copyright of this still applies to the later add/cycle commands (a668ae0ff90c4). While I'm not sure if this is really the case, stay conservative for now and mark these commands as GPL-only. Mark the command.c code too, although that is not being relicensed yet. I'm leaving the MP_CMD_* enum items, as they are obviously different. In commit 116ca0c7682, "veal" (essentially an anonymous author) adds an "osd_show_property_text" command (well, the commit message says "based on" that person's code, so it's not clear how much is from him or from albeu, who agreed to LGPL). This was later merged again with the "osd_show_text" command, and then all original code was removed in commit 58cc0f637f, so I claim that no copyright applies anymore. (Though technically the input.conf addition still might be copyrighted, so I'm just dropping it to get rid of the thought.) "kiriuja" added 2f376d1b39 (sub_load etc.) and be54f4813 (switch_audio). The latter is gone. I would argue that the former is fully rewritten with commits b7052b431c9 and 0f155921b0. But like in the step_property case, I will be overly conservative for now, and mark them as GPL-only, as this is potentially shaky and should be thought through first. (Not bothering with the command define/enum in the header, as it will be unused in LGPL mode anyway.) keycodes.c/h can be GPL, except for commit 2b1f95dcc2f8, which is a patch by someone who wasn't asked yet. Before doing something radical, I will wait for a reply.
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/player/command.c b/player/command.c
index 4c15d17ca1..742b1fa91a 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4945,6 +4945,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
break;
}
+#if HAVE_GPL
case MP_CMD_ADD:
case MP_CMD_CYCLE:
{
@@ -4981,6 +4982,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
}
break;
}
+#endif
case MP_CMD_MULTIPLY: {
char *property = cmd->args[0].v.s;
@@ -5286,6 +5288,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
break;
}
+#if HAVE_GPL
case MP_CMD_SUB_ADD:
case MP_CMD_AUDIO_ADD: {
if (!mpctx->playing)
@@ -5337,6 +5340,7 @@ 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: {