mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for api changes

Browse source
This commit is contained in:
Wim Taymans 2019-02-18 12:27:38 +01:00
parent 5f9200d9ee
commit 61edd78bf4
3 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/introspect.c
View file

@ -27,19 +27,21 @@
#include "internal.h"
static void node_event_info(void *object, const struct pw_node_info *info)
static int node_event_info(void *object, const struct pw_node_info *info)
{
struct global *g = object;
pw_log_debug("update %d", g->id);
g->info = pw_node_info_update(g->info, info);
return 0;
}
static void node_event_param(void *object,
static int node_event_param(void *object,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct global *g = object;
pw_log_debug("update param %d", g->id);
return 0;
}
static const struct pw_node_proxy_events node_events = {
@ -48,7 +50,7 @@ static const struct pw_node_proxy_events node_events = {
.param = node_event_param,
};
static void module_event_info(void *object, const struct pw_module_info *info)
static int module_event_info(void *object, const struct pw_module_info *info)
{
struct global *g = object;
pa_module_info *i = &g->module_info.info;
@ -71,6 +73,7 @@ static void module_event_info(void *object, const struct pw_module_info *info)
i->argument = info->args;
i->n_used = -1;
i->auto_unload = false;
return 0;
}
static const struct pw_module_proxy_events module_events = {
@ -78,7 +81,7 @@ static const struct pw_module_proxy_events module_events = {
.info = module_event_info,
};
static void client_event_info(void *object, const struct pw_client_info *info)
static int client_event_info(void *object, const struct pw_client_info *info)
{
struct global *g = object;
pa_client_info *i = &g->client_info.info;
@ -99,6 +102,7 @@ static void client_event_info(void *object, const struct pw_client_info *info)
i->driver = info->props ?
spa_dict_lookup(info->props, PW_CLIENT_PROP_PROTOCOL) : NULL;
}
return 0;
}
static const struct pw_client_proxy_events client_events = {
@ -106,7 +110,7 @@ static const struct pw_client_proxy_events client_events = {
.info = client_event_info,
};
static void device_event_param(void *object,
static int device_event_param(void *object,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
@ -123,7 +127,7 @@ static void device_event_param(void *object,
SPA_PARAM_PROFILE_index, SPA_POD_Int(&id),
SPA_PARAM_PROFILE_name, SPA_POD_String(&name)) < 0) {
pw_log_warn("device %d: can't parse profile", g->id);
return;
return -EINVAL;
}
pw_array_add_ptr(&g->card_info.profiles, pw_spa_pod_copy(param));
pw_log_debug("device %d: enum profile %d: \"%s\"", g->id, id, name);
@ -136,7 +140,7 @@ static void device_event_param(void *object,
SPA_TYPE_OBJECT_ParamProfile, NULL,
SPA_PARAM_PROFILE_index, SPA_POD_Int(&id)) < 0) {
pw_log_warn("device %d: can't parse profile", g->id);
return;
return -EINVAL;
}
g->card_info.active_profile = id;
pw_log_debug("device %d: current profile %d", g->id, id);
@ -145,9 +149,10 @@ static void device_event_param(void *object,
default:
break;
}
return 0;
}
static void device_event_info(void *object, const struct pw_device_info *info)
static int device_event_info(void *object, const struct pw_device_info *info)
{
struct global *g = object;
pa_card_info *i = &g->card_info.info;
@ -166,6 +171,7 @@ static void device_event_info(void *object, const struct pw_device_info *info)
else
i->proplist = pa_proplist_new_dict(info->props);
}
return 0;
}
static const struct pw_device_proxy_events device_events = {