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

update to master

Browse source
This commit is contained in:
Chengyi Zhao 2024-06-25 17:03:12 +08:00
parent 7138fa0272
commit fccb4bd29d
107 changed files with 29 additions and 51635 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulsecore/core.c
View file

@ -40,10 +40,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/strbuf.h>
<<<<<<< HEAD
=======
#include <pulsecore/namereg.h>
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#include "core.h"
@ -90,15 +87,9 @@ static char *message_handler_list(pa_core *c) {
}
static int core_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
<<<<<<< HEAD
pa_core *c;
pa_assert(c = (pa_core *) userdata);
=======
pa_core *c = userdata;
pa_assert(c);
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
pa_assert(message);
pa_assert(response);
pa_assert(pa_safe_streq(object_path, "/core"));