mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

json: remove json from public API

Browse source 
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/570>
This commit is contained in:
Igor V. Kovalenko 2021-06-01 22:35:26 +03:00 • committed by PulseAudio Marge Bot
parent a12d90e2ed
commit 2a5497bac5
10 changed files with 8 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/meson.build
View file

@ -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',

2
src/modules/bluetooth/module-bluez5-device.c
View file

@ -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>

2
src/pulse/format.c
View file

@ -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>

33
src/pulse/map-file
View 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;

1
src/pulse/meson.build
View file

@ -47,7 +47,6 @@ libpulse_headers = [
'format.h',
'gccmacro.h',
'introspect.h',
'json.h',
'mainloop-api.h',
'mainloop-signal.h',
'mainloop.h',

2
src/pulse/json.c → src/pulsecore/json.c
View file

@ -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 */

0
src/pulse/json.h → src/pulsecore/json.h
View file

2
src/pulsecore/message-handler.h
View file

@ -19,7 +19,7 @@
***/
#include <pulsecore/core.h>
#include <pulse/json.h>
#include <pulsecore/json.h>
/* Message handler types and functions */

2
src/tests/json-test.c
View file

@ -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;

2
src/utils/pactl.c
View file

@ -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>