various: reduce the include scope of some public headers

Kacper Michajłow committed 1 year ago

Commit 77313f71 parent b848ffa16 files · +30 −24Browse files

Showing the changes to misc (4 of 16 files). Show all

Unified · Split

4 files

 #ifndef MP_JSON_H
 #define MP_JSON_H
-// We reuse mpv_node.
-#include "libmpv/client.h"
 #define MAX_JSON_DEPTH 50
 struct bstr;
+struct mpv_node;
 int json_parse(void *ta_parent, struct mpv_node *dst, char **src, int max_depth);
 int json_append(struct bstr *b, const struct mpv_node *src, int indent);

-#include "common/common.h"
 #include "node.h"
+#include <libmpv/client.h>
+#include "common/common.h"
+#include "bstr.h"
 // Init a node with the given format. If parent is not NULL, it is set as
 // parent allocation according to m_option_type_node rules (which means
 // the mpv_node_list allocs are used for chaining the TA allocations).
 // Note: for MPV_FORMAT_NODE_MAP, this (incorrectly) takes the order into
 //       account, instead of treating it as set.
-bool equal_mpv_value(const void *a, const void *b, mpv_format format)
+bool equal_mpv_value(const void *a, const void *b, int format)
 {
     switch (format) {
     case MPV_FORMAT_NONE:

 #ifndef MP_MISC_NODE_H_
 #define MP_MISC_NODE_H_
-#include "libmpv/client.h"
+#include <stdbool.h>
-#include "misc/bstr.h"
+#include <stdint.h>
+struct bstr;
+struct mpv_node;
 void node_init(struct mpv_node *dst, int format, struct mpv_node *parent);
 struct mpv_node *node_array_add(struct mpv_node *dst, int format);
 struct mpv_node *node_map_add(struct mpv_node *dst, const char *key, int format);
 struct mpv_node *node_map_badd(struct mpv_node *dst, struct bstr key, int format);
 void node_map_add_string(struct mpv_node *dst, const char *key, const char *val);
-void node_map_add_bstr(struct mpv_node *dst, const char *key, bstr val);
+void node_map_add_bstr(struct mpv_node *dst, const char *key, struct bstr val);
 void node_map_add_int64(struct mpv_node *dst, const char *key, int64_t v);
 void node_map_add_double(struct mpv_node *dst, const char *key, double v);
 void node_map_add_flag(struct mpv_node *dst, const char *key, bool v);
-mpv_node *node_map_get(mpv_node *src, const char *key);
+struct mpv_node *node_map_get(struct mpv_node *src, const char *key);
-mpv_node *node_map_bget(mpv_node *src, struct bstr key);
+struct mpv_node *node_map_bget(struct mpv_node *src, struct bstr key);
-bool equal_mpv_value(const void *a, const void *b, mpv_format format);
+bool equal_mpv_value(const void *a, const void *b, int format);
 bool equal_mpv_node(const struct mpv_node *a, const struct mpv_node *b);
 #endif

Keyboard shortcuts