mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-23 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

message-params: use JSON instead of custom format

Browse source 
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/525>
This commit is contained in:
Igor V. Kovalenko 2021-03-14 09:49:05 +03:00 • committed by PulseAudio Marge Bot
parent 0ba768b2e9
commit 1dd05f4a9b
6 changed files with 93 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pulsecore/message-handler.c
View file

@ -105,7 +105,8 @@ void pa_message_handler_unregister(pa_core *c, const char *object_path) {
int pa_message_handler_send_message(pa_core *c, const char *object_path, const char *message, const char *message_parameters, char **response) {
struct pa_message_handler *handler;
int ret;
char *parameter_copy, *path_copy;
char *path_copy;
pa_json_object *parameters = NULL;
pa_assert(c);
pa_assert(object_path);
@ -125,14 +126,21 @@ int pa_message_handler_send_message(pa_core *c, const char *object_path, const c
return -PA_ERR_NOENTITY;
}
parameter_copy = pa_xstrdup(message_parameters);
pa_xfree(path_copy);
if (message_parameters) {
parameters = pa_json_parse(message_parameters);
if (!parameters)
return -PA_ERR_INVALID;
}
/* The handler is expected to return an error code and may also
return an error string in response */
ret = handler->callback(handler->object_path, message, parameter_copy, response, handler->userdata);
ret = handler->callback(handler->object_path, message, parameters, response, handler->userdata);
pa_xfree(parameter_copy);
pa_xfree(path_copy);
if (parameters)
pa_json_object_free(parameters);
return ret;
}