Showing the changes to misc (4 of 16 files). Show all
Unified · Split
| @@ -48,6 +48,8 @@ · 47 unmodified lines | ||
| 48 | 48 | #include <inttypes.h> |
| 49 | 49 | #include <assert.h> |
| 50 | 50 | |
| 51 | +#include <libmpv/client.h> | |
| 52 | + | |
| 51 | 53 | #include "common/common.h" |
| 52 | 54 | #include "misc/bstr.h" |
| 53 | 55 | #include "misc/ctype.h" |
| @@ -18,12 +18,10 @@ · 17 unmodified lines | ||
| 18 | 18 | #ifndef MP_JSON_H |
| 19 | 19 | #define MP_JSON_H |
| 20 | 20 | |
| 21 | −// We reuse mpv_node. | |
| 22 | −#include "libmpv/client.h" | |
| 23 | − | |
| 24 | 21 | #define MAX_JSON_DEPTH 50 |
| 25 | 22 | |
| 26 | 23 | struct bstr; |
| 24 | +struct mpv_node; | |
| 27 | 25 | |
| 28 | 26 | int json_parse(void *ta_parent, struct mpv_node *dst, char **src, int max_depth); |
| 29 | 27 | int json_append(struct bstr *b, const struct mpv_node *src, int indent); |
| @@ -1,7 +1,10 @@ | ||
| 1 | −#include "common/common.h" | |
| 2 | − | |
| 3 | 1 | #include "node.h" |
| 4 | 2 | |
| 3 | +#include <libmpv/client.h> | |
| 4 | + | |
| 5 | +#include "common/common.h" | |
| 6 | +#include "bstr.h" | |
| 7 | + | |
| 5 | 8 | // Init a node with the given format. If parent is not NULL, it is set as |
| 6 | 9 | // parent allocation according to m_option_type_node rules (which means |
| 7 | 10 | // the mpv_node_list allocs are used for chaining the TA allocations). |
| @@ -117,7 +120,7 @@ mpv_node *node_map_bget(mpv_node *src, struct bstr key) · 109 unmodified lines | ||
| 117 | 120 | |
| 118 | 121 | // Note: for MPV_FORMAT_NODE_MAP, this (incorrectly) takes the order into |
| 119 | 122 | // account, instead of treating it as set. |
| 120 | −bool equal_mpv_value(const void *a, const void *b, mpv_format format) | |
| 123 | +bool equal_mpv_value(const void *a, const void *b, int format) | |
| 121 | 124 | { |
| 122 | 125 | switch (format) { |
| 123 | 126 | case MPV_FORMAT_NONE: |
| @@ -1,21 +1,24 @@ | ||
| 1 | 1 | #ifndef MP_MISC_NODE_H_ |
| 2 | 2 | #define MP_MISC_NODE_H_ |
| 3 | 3 | |
| 4 | −#include "libmpv/client.h" | |
| 5 | −#include "misc/bstr.h" | |
| 4 | +#include <stdbool.h> | |
| 5 | +#include <stdint.h> | |
| 6 | + | |
| 7 | +struct bstr; | |
| 8 | +struct mpv_node; | |
| 6 | 9 | |
| 7 | 10 | void node_init(struct mpv_node *dst, int format, struct mpv_node *parent); |
| 8 | 11 | struct mpv_node *node_array_add(struct mpv_node *dst, int format); |
| 9 | 12 | struct mpv_node *node_map_add(struct mpv_node *dst, const char *key, int format); |
| 10 | 13 | struct mpv_node *node_map_badd(struct mpv_node *dst, struct bstr key, int format); |
| 11 | 14 | void node_map_add_string(struct mpv_node *dst, const char *key, const char *val); |
| 12 | −void node_map_add_bstr(struct mpv_node *dst, const char *key, bstr val); | |
| 15 | +void node_map_add_bstr(struct mpv_node *dst, const char *key, struct bstr val); | |
| 13 | 16 | void node_map_add_int64(struct mpv_node *dst, const char *key, int64_t v); |
| 14 | 17 | void node_map_add_double(struct mpv_node *dst, const char *key, double v); |
| 15 | 18 | void node_map_add_flag(struct mpv_node *dst, const char *key, bool v); |
| 16 | −mpv_node *node_map_get(mpv_node *src, const char *key); | |
| 17 | −mpv_node *node_map_bget(mpv_node *src, struct bstr key); | |
| 18 | −bool equal_mpv_value(const void *a, const void *b, mpv_format format); | |
| 19 | +struct mpv_node *node_map_get(struct mpv_node *src, const char *key); | |
| 20 | +struct mpv_node *node_map_bget(struct mpv_node *src, struct bstr key); | |
| 21 | +bool equal_mpv_value(const void *a, const void *b, int format); | |
| 19 | 22 | bool equal_mpv_node(const struct mpv_node *a, const struct mpv_node *b); |
| 20 | 23 | |
| 21 | 24 | #endif |