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

session-manager: fix protocol

Browse source 
Add separate types for interfaces and implementation
Fix some bugs in the protocol
Add some introspection support in cli
This commit is contained in:
Wim Taymans 2019-11-04 16:42:55 +01:00
parent 29254b688a
commit 085f1822b9
9 changed files with 166 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

138
src/tools/pipewire-cli.c
View file

@ -269,7 +269,7 @@ static void on_core_info(void *_data, const struct pw_core_info *info)
{
struct remote_data *rd = _data;
free(rd->name);
rd->name = strdup(info->name);
rd->name = info->name ? strdup(info->name) : NULL;
fprintf(stdout, "remote %d is named '%s'\n", rd->id, rd->name);
}
@ -659,6 +659,16 @@ static void info_device(struct proxy_data *pd)
info->change_mask = 0;
}
static void info_session(struct proxy_data *pd)
{
struct pw_session_info *info = pd->info;
info_global(pd);
print_properties(info->props, MARK_CHANGE(0), true);
print_params(info->params, info->n_params, MARK_CHANGE(1), true);
info->change_mask = 0;
}
static void info_endpoint(struct proxy_data *pd)
{
struct pw_endpoint_info *info = pd->info;
@ -693,6 +703,19 @@ static void info_endpoint(struct proxy_data *pd)
info->change_mask = 0;
}
static void info_endpoint_stream(struct proxy_data *pd)
{
struct pw_endpoint_stream_info *info = pd->info;
info_global(pd);
fprintf(stdout, "\tid: %u\n", info->id);
fprintf(stdout, "\tendpoint-id: %u\n", info->endpoint_id);
fprintf(stdout, "\tname: %s\n", info->name);
print_properties(info->props, MARK_CHANGE(1), true);
print_params(info->params, info->n_params, MARK_CHANGE(2), true);
info->change_mask = 0;
}
static void core_event_info(void *object, const struct pw_core_info *info)
{
struct proxy_data *pd = object;
@ -894,6 +917,53 @@ static const struct pw_device_proxy_events device_events = {
.param = event_param
};
static void session_info_free(struct pw_session_info *info)
{
free(info->params);
if (info->props)
pw_properties_free ((struct pw_properties *)info->props);
free(info);
}
static void session_event_info(void *object,
const struct pw_session_info *update)
{
struct proxy_data *pd = object;
struct remote_data *rd = pd->rd;
struct pw_session_info *info = pd->info;
if (!info) {
info = pd->info = calloc(1, sizeof(*info));
info->id = update->id;
}
if (update->change_mask & PW_ENDPOINT_CHANGE_MASK_PARAMS) {
info->n_params = update->n_params;
free(info->params);
info->params = malloc(info->n_params * sizeof(struct spa_param_info));
memcpy(info->params, update->params,
info->n_params * sizeof(struct spa_param_info));
}
if (update->change_mask & PW_ENDPOINT_CHANGE_MASK_PROPS) {
if (info->props)
pw_properties_free ((struct pw_properties *)info->props);
info->props =
(struct spa_dict *) pw_properties_new_dict (update->props);
}
if (pd->global == NULL)
pd->global = pw_map_lookup(&rd->globals, info->id);
if (pd->global && pd->global->info_pending) {
info_session(pd);
pd->global->info_pending = false;
}
}
static const struct pw_session_proxy_events session_events = {
PW_VERSION_SESSION_PROXY_EVENTS,
.info = session_event_info,
.param = event_param
};
static void endpoint_info_free(struct pw_endpoint_info *info)
{
free(info->name);
@ -914,8 +984,8 @@ static void endpoint_event_info(void *object,
if (!info) {
info = pd->info = calloc(1, sizeof(*info));
info->id = update->id;
info->name = strdup(update->name);
info->media_class = strdup(update->media_class);
info->name = update->name ? strdup(update->name) : NULL;
info->media_class = update->media_class ? strdup(update->media_class) : NULL;
info->direction = update->direction;
info->flags = update->flags;
}
@ -951,6 +1021,56 @@ static const struct pw_endpoint_proxy_events endpoint_events = {
.param = event_param
};
static void endpoint_stream_info_free(struct pw_endpoint_stream_info *info)
{
free(info->name);
free(info->params);
if (info->props)
pw_properties_free ((struct pw_properties *)info->props);
free(info);
}
static void endpoint_stream_event_info(void *object,
const struct pw_endpoint_stream_info *update)
{
struct proxy_data *pd = object;
struct remote_data *rd = pd->rd;
struct pw_endpoint_stream_info *info = pd->info;
if (!info) {
info = pd->info = calloc(1, sizeof(*info));
info->id = update->id;
info->endpoint_id = update->endpoint_id;
info->name = update->name ? strdup(update->name) : NULL;
}
if (update->change_mask & PW_ENDPOINT_STREAM_CHANGE_MASK_PARAMS) {
info->n_params = update->n_params;
free(info->params);
info->params = malloc(info->n_params * sizeof(struct spa_param_info));
memcpy(info->params, update->params,
info->n_params * sizeof(struct spa_param_info));
}
if (update->change_mask & PW_ENDPOINT_STREAM_CHANGE_MASK_PROPS) {
if (info->props)
pw_properties_free ((struct pw_properties *)info->props);
info->props =
(struct spa_dict *) pw_properties_new_dict (update->props);
}
if (pd->global == NULL)
pd->global = pw_map_lookup(&rd->globals, info->id);
if (pd->global && pd->global->info_pending) {
info_endpoint_stream(pd);
pd->global->info_pending = false;
}
}
static const struct pw_endpoint_stream_proxy_events endpoint_stream_events = {
PW_VERSION_ENDPOINT_STREAM_PROXY_EVENTS,
.info = endpoint_stream_event_info,
.param = event_param
};
static void
destroy_proxy (void *data)
{
@ -1037,12 +1157,24 @@ static bool bind_global(struct remote_data *rd, struct global *global, char **er
destroy = (pw_destroy_t) pw_link_info_free;
info_func = info_link;
break;
case PW_TYPE_INTERFACE_Session:
events = &session_events;
client_version = PW_VERSION_SESSION_PROXY;
destroy = (pw_destroy_t) session_info_free;
info_func = info_session;
break;
case PW_TYPE_INTERFACE_Endpoint:
events = &endpoint_events;
client_version = PW_VERSION_ENDPOINT_PROXY;
destroy = (pw_destroy_t) endpoint_info_free;
info_func = info_endpoint;
break;
case PW_TYPE_INTERFACE_EndpointStream:
events = &endpoint_stream_events;
client_version = PW_VERSION_ENDPOINT_STREAM_PROXY;
destroy = (pw_destroy_t) endpoint_stream_info_free;
info_func = info_endpoint_stream;
break;
default:
asprintf(error, "unsupported type %s", spa_debug_type_find_name(pw_type_info(), global->type));
return false;