summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-12 14:48:24 +0200
committerwm4 <wm4@nowhere>2018-05-24 19:56:34 +0200
commit1157f07c5b8b97112f9a6bde695aff8072a88fb2 (patch)
tree03cb53ab5789bca871228cef6698f97d87b92ac4 /input
parent4fd3ad8d63aabeb1dc2448d650bb942d24163f54 (diff)
downloadmpv-1157f07c5b8b97112f9a6bde695aff8072a88fb2.tar.bz2
mpv-1157f07c5b8b97112f9a6bde695aff8072a88fb2.tar.xz
node: move a mpv_node helper from ipc.c to shared code
This particular one is needed in a following commit.
Diffstat (limited to 'input')
-rw-r--r--input/ipc.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/input/ipc.c b/input/ipc.c
index fc1e11b981..386a03b909 100644
--- a/input/ipc.c
+++ b/input/ipc.c
@@ -20,23 +20,12 @@
#include "common/msg.h"
#include "input/input.h"
#include "misc/json.h"
+#include "misc/node.h"
#include "options/m_option.h"
#include "options/options.h"
#include "options/path.h"
#include "player/client.h"
-static mpv_node *mpv_node_map_get(mpv_node *src, const char *key)
-{
- if (src->format != MPV_FORMAT_NODE_MAP)
- return NULL;
-
- for (int i = 0; i < src->u.list->num; i++)
- if (!strcmp(key, src->u.list->keys[i]))
- return &src->u.list->values[i];
-
- return NULL;
-}
-
static mpv_node *mpv_node_array_get(mpv_node *src, int index)
{
if (src->format != MPV_FORMAT_NODE_ARRAY)
@@ -217,9 +206,9 @@ static char *json_execute_command(struct mpv_handle *client, void *ta_parent,
goto error;
}
- reqid_node = mpv_node_map_get(&msg_node, "request_id");
+ reqid_node = node_map_get(&msg_node, "request_id");
- mpv_node *cmd_node = mpv_node_map_get(&msg_node, "command");
+ mpv_node *cmd_node = node_map_get(&msg_node, "command");
if (!cmd_node ||
(cmd_node->format != MPV_FORMAT_NODE_ARRAY) ||
!cmd_node->u.list->num)