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

pipewire: module-session-manager: harmonize type of change_mask

Browse source 
The `pw_*_info` structures in core pipewire all have 64-bit change
masks. Convert the change masks in the session manager extension
to 64-bit as the differing sizes can cause problems.

This introduces an API and ABI break unfortunately, but due to
the limited number of users of the session manager extension,
it was deemed safe.

See wireplumber#49
This commit is contained in:
Barnabás Pőcze 2021-12-14 13:45:23 +01:00 • committed by Wim Taymans
parent 10755ff115
commit e6e27fe74c
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-session-manager/protocol-native.c
View file

@ -126,7 +126,7 @@ marshal_pw_session_info(struct spa_pod_builder *b,
spa_pod_builder_add(b,
SPA_POD_Int(info->version),
SPA_POD_Int(info->id),
SPA_POD_Int(info->change_mask),
SPA_POD_Long(info->change_mask),
NULL);
push_dict(b, info->props);
push_param_infos(b, info->n_params, info->params);
@ -143,7 +143,7 @@ do { \
spa_pod_parser_get(p, \
SPA_POD_Int(&version), \
SPA_POD_Int(&(info)->id), \
SPA_POD_Int(&(info)->change_mask), \
SPA_POD_Long(&(info)->change_mask), \
NULL) < 0) \
return -EINVAL; \
\
@ -169,7 +169,7 @@ marshal_pw_endpoint_info(struct spa_pod_builder *b,
SPA_POD_String(info->media_class),
SPA_POD_Int(info->direction),
SPA_POD_Int(info->flags),
SPA_POD_Int(info->change_mask),
SPA_POD_Long(info->change_mask),
SPA_POD_Int(info->n_streams),
SPA_POD_Int(info->session_id),
NULL);
@ -192,7 +192,7 @@ do { \
SPA_POD_String(&(info)->media_class), \
SPA_POD_Int(&(info)->direction), \
SPA_POD_Int(&(info)->flags), \
SPA_POD_Int(&(info)->change_mask), \
SPA_POD_Long(&(info)->change_mask), \
SPA_POD_Int(&(info)->n_streams), \
SPA_POD_Int(&(info)->session_id), \
NULL) < 0) \
@ -218,7 +218,7 @@ marshal_pw_endpoint_stream_info(struct spa_pod_builder *b,
SPA_POD_Int(info->id),
SPA_POD_Int(info->endpoint_id),
SPA_POD_String(info->name),
SPA_POD_Int(info->change_mask),
SPA_POD_Long(info->change_mask),
SPA_POD_Pod(info->link_params),
NULL);
push_dict(b, info->props);
@ -238,7 +238,7 @@ do { \
SPA_POD_Int(&(info)->id), \
SPA_POD_Int(&(info)->endpoint_id), \
SPA_POD_String(&(info)->name), \
SPA_POD_Int(&(info)->change_mask), \
SPA_POD_Long(&(info)->change_mask), \
SPA_POD_Pod(&(info)->link_params), \
NULL) < 0) \
return -EINVAL; \
@ -266,7 +266,7 @@ marshal_pw_endpoint_link_info(struct spa_pod_builder *b,
SPA_POD_Int(info->output_stream_id),
SPA_POD_Int(info->input_endpoint_id),
SPA_POD_Int(info->input_stream_id),
SPA_POD_Int(info->change_mask),
SPA_POD_Long(info->change_mask),
SPA_POD_Int(info->state),
SPA_POD_String(info->error),
NULL);
@ -290,7 +290,7 @@ do { \
SPA_POD_Int(&(info)->output_stream_id), \
SPA_POD_Int(&(info)->input_endpoint_id), \
SPA_POD_Int(&(info)->input_stream_id), \
SPA_POD_Int(&(info)->change_mask), \
SPA_POD_Long(&(info)->change_mask), \
SPA_POD_Int(&(info)->state), \
SPA_POD_String(&(info)->error), \
NULL) < 0) \