summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-13 12:19:11 +0200
committersfan5 <sfan5@live.de>2018-05-25 10:45:59 +0200
commit40ebedabcfbbff03319843692852e141161be785 (patch)
tree2c102295628ad8a55b6472a752f352c722136a6b
parent47ed894d19678c915a3185945b3f97baeeecafb4 (diff)
downloadmpv-40ebedabcfbbff03319843692852e141161be785.tar.bz2
mpv-40ebedabcfbbff03319843692852e141161be785.tar.xz
ipc: alias set_property_string to set_property
The only effective difference is that the former explicitly checks whether the JSON value type is string, and errors out if not. The rest is exactly the same (mpv_set_property_string is mpv_set_property with MPV_FORMAT_STRING). It seems silly to keep this, so just remove it.
-rw-r--r--DOCS/man/ipc.rst9
-rw-r--r--input/ipc.c23
2 files changed, 4 insertions, 28 deletions
diff --git a/DOCS/man/ipc.rst b/DOCS/man/ipc.rst
index 289ef5b799..1a5eadfe49 100644
--- a/DOCS/man/ipc.rst
+++ b/DOCS/man/ipc.rst
@@ -180,14 +180,7 @@ extra commands can also be used as part of the protocol:
{ "error": "success" }
``set_property_string``
- Like ``set_property``, but the argument value must be passed as string.
-
- Example:
-
- ::
-
- { "command": ["set_property_string", "pause", "yes"] }
- { "error": "success" }
+ Alias for ``set_property``. Both commands accept native values and strings.
``observe_property``
Watch a property for changes. If the given property is changed, then an
diff --git a/input/ipc.c b/input/ipc.c
index fc1e11b981..d87b495412 100644
--- a/input/ipc.c
+++ b/input/ipc.c
@@ -286,7 +286,9 @@ static char *json_execute_command(struct mpv_handle *client, void *ta_parent,
mpv_node_map_add_string(ta_parent, &reply_node, "data", result);
mpv_free(result);
}
- } else if (!strcmp("set_property", cmd)) {
+ } else if (!strcmp("set_property", cmd) ||
+ !strcmp("set_property_string", cmd))
+ {
if (cmd_node->u.list->num != 3) {
rc = MPV_ERROR_INVALID_PARAMETER;
goto error;
@@ -299,25 +301,6 @@ static char *json_execute_command(struct mpv_handle *client, void *ta_parent,
rc = mpv_set_property(client, cmd_node->u.list->values[1].u.string,
MPV_FORMAT_NODE, &cmd_node->u.list->values[2]);
- } else if (!strcmp("set_property_string", cmd)) {
- if (cmd_node->u.list->num != 3) {
- rc = MPV_ERROR_INVALID_PARAMETER;
- goto error;
- }
-
- if (cmd_node->u.list->values[1].format != MPV_FORMAT_STRING) {
- rc = MPV_ERROR_INVALID_PARAMETER;
- goto error;
- }
-
- if (cmd_node->u.list->values[2].format != MPV_FORMAT_STRING) {
- rc = MPV_ERROR_INVALID_PARAMETER;
- goto error;
- }
-
- rc = mpv_set_property_string(client,
- cmd_node->u.list->values[1].u.string,
- cmd_node->u.list->values[2].u.string);
} else if (!strcmp("observe_property", cmd)) {
if (cmd_node->u.list->num != 3) {
rc = MPV_ERROR_INVALID_PARAMETER;