json: remove json from public API

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/570>

10 files changed, 8 insertions, 42 deletions

diff --git a/src/meson.build b/src/meson.build
index 69319c2f9..e2860811b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,7 +3,6 @@ libpulsecommon_sources = [
   'pulse/error.c',
   'pulse/fork-detect.c',
   'pulse/format.c',
-  'pulse/json.c',
   'pulse/mainloop-api.c',
   'pulse/xmalloc.c',
   'pulse/proplist.c',
@@ -31,6 +30,7 @@ libpulsecommon_sources = [
   'pulsecore/iochannel.c',
   'pulsecore/ioline.c',
   'pulsecore/ipacl.c',
+  'pulsecore/json.c',
   'pulsecore/lock-autospawn.c',
   'pulsecore/log.c',
   'pulsecore/ratelimit.c',
@@ -73,7 +73,6 @@ libpulsecommon_headers = [
   'pulse/error.h',
   'pulse/fork-detect.h',
   'pulse/format.h',
-  'pulse/json.h',
   'pulse/mainloop-api.h',
   'pulse/xmalloc.h',
   'pulse/proplist.h',
@@ -104,6 +103,7 @@ libpulsecommon_headers = [
   'pulsecore/iochannel.h',
   'pulsecore/ioline.h',
   'pulsecore/ipacl.h',
+  'pulsecore/json.h',
   'pulsecore/llist.h',
   'pulsecore/lock-autospawn.h',
   'pulsecore/log.h',
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index 993fac302..49f318d1a 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -27,7 +27,6 @@
 
 #include <arpa/inet.h>
 
-#include <pulse/json.h>
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
 #include <pulse/utf8.h>
@@ -37,6 +36,7 @@
 #include <pulsecore/core-rtclock.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/i18n.h>
+#include <pulsecore/json.h>
 #include <pulsecore/message-handler.h>
 #include <pulsecore/module.h>
 #include <pulsecore/modargs.h>
diff --git a/src/pulse/format.c b/src/pulse/format.c
index 2e90821b9..00bae2d46 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -23,13 +23,13 @@
 #include <config.h>
 #endif
 
-#include <pulse/json.h>
 #include <pulse/internal.h>
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-format.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/i18n.h>
+#include <pulsecore/json.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/strbuf.h>
 
diff --git a/src/pulse/map-file b/src/pulse/map-file
index 7141ea003..3df03cdd3 100644
--- a/src/pulse/map-file
+++ b/src/pulse/map-file
@@ -215,39 +215,6 @@ pa_gettimeofday;
 pa_glib_mainloop_free;
 pa_glib_mainloop_get_api;
 pa_glib_mainloop_new;
-pa_json_encoder_add_element_bool;
-pa_json_encoder_add_element_double;
-pa_json_encoder_add_element_int;
-pa_json_encoder_add_element_null;
-pa_json_encoder_add_element_raw_json;
-pa_json_encoder_add_element_string;
-pa_json_encoder_add_member_bool;
-pa_json_encoder_add_member_double;
-pa_json_encoder_add_member_int;
-pa_json_encoder_add_member_null;
-pa_json_encoder_add_member_raw_json;
-pa_json_encoder_add_member_string;
-pa_json_encoder_begin_element_array;
-pa_json_encoder_begin_element_object;
-pa_json_encoder_begin_member_array;
-pa_json_encoder_begin_member_object;
-pa_json_encoder_end_array;
-pa_json_encoder_end_object;
-pa_json_encoder_free;
-pa_json_encoder_new;
-pa_json_encoder_to_string_free;
-pa_json_object_equal;
-pa_json_object_free;
-pa_json_object_get_array_length;
-pa_json_object_get_array_member;
-pa_json_object_get_bool;
-pa_json_object_get_double;
-pa_json_object_get_int;
-pa_json_object_get_object_member;
-pa_json_object_get_object_member_hashmap;
-pa_json_object_get_string;
-pa_json_object_get_type;
-pa_json_parse;
 pa_locale_to_utf8;
 pa_mainloop_api_once;
 pa_mainloop_dispatch;
diff --git a/src/pulse/meson.build b/src/pulse/meson.build
index 878006822..c2128e087 100644
--- a/src/pulse/meson.build
+++ b/src/pulse/meson.build
@@ -47,7 +47,6 @@ libpulse_headers = [
   'format.h',
   'gccmacro.h',
   'introspect.h',
-  'json.h',
   'mainloop-api.h',
   'mainloop-signal.h',
   'mainloop.h',
diff --git a/src/pulse/json.c b/src/pulsecore/json.c
index 460e9a7af..0b7b4c3e0 100644
--- a/src/pulse/json.c
+++ b/src/pulsecore/json.c
@@ -23,10 +23,10 @@
 
 #include <math.h>
 
-#include <pulse/json.h>
 #include <pulse/xmalloc.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/hashmap.h>
+#include <pulsecore/json.h>
 #include <pulsecore/strbuf.h>
 
 #define MAX_NESTING_DEPTH 20 /* Arbitrary number to make sure we don't have a stack overflow */
diff --git a/src/pulse/json.h b/src/pulsecore/json.h
index 0c5024288..0c5024288 100644
--- a/src/pulse/json.h
+++ b/src/pulsecore/json.h
diff --git a/src/pulsecore/message-handler.h b/src/pulsecore/message-handler.h
index b42d8c636..16dfc310e 100644
--- a/src/pulsecore/message-handler.h
+++ b/src/pulsecore/message-handler.h
@@ -19,7 +19,7 @@
 ***/
 
 #include <pulsecore/core.h>
-#include <pulse/json.h>
+#include <pulsecore/json.h>
 
 /* Message handler types and functions */
 
diff --git a/src/tests/json-test.c b/src/tests/json-test.c
index e0030ad20..a5a5e80ae 100644
--- a/src/tests/json-test.c
+++ b/src/tests/json-test.c
@@ -23,9 +23,9 @@
 
 #include <check.h>
 
-#include <pulse/json.h>
 #include <pulse/xmalloc.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/json.h>
 
 START_TEST (string_test) {
     pa_json_object *o;
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 66b8f5e19..0f68861d7 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -36,9 +36,9 @@
 
 #include <pulse/pulseaudio.h>
 #include <pulse/ext-device-restore.h>
-#include <pulse/json.h>
 
 #include <pulsecore/i18n.h>
+#include <pulsecore/json.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>