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

v0: improve compatibility

Browse source 
Implement RequestClockUpdate event and ClockUpdate message for
old clients.
This commit is contained in:
Wim Taymans 2020-02-11 11:23:28 +01:00
parent c12f2276c4
commit 293932d4ec
7 changed files with 152 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/module-protocol-native/v0/protocol-native.c
View file

@ -350,16 +350,9 @@ const char * pw_protocol_native0_name_from_v2(struct pw_impl_client *client, uin
}
SPA_EXPORT
uint32_t pw_protocol_native0_type_to_v2(struct pw_impl_client *client,
const struct spa_type_info *info, uint32_t type)
uint32_t pw_protocol_native0_name_to_v2(struct pw_impl_client *client, const char *name)
{
uint32_t i;
const char *name;
/** find full name of type in type_info */
if ((name = spa_debug_type_find_name(info, type)) == NULL)
return SPA_ID_INVALID;
/* match name to type table and return index */
for (i = 0; i < SPA_N_ELEMENTS(type_map); i++) {
if (type_map[i].name != NULL && !strcmp(type_map[i].name, name))
@ -368,6 +361,19 @@ uint32_t pw_protocol_native0_type_to_v2(struct pw_impl_client *client,
return SPA_ID_INVALID;
}
SPA_EXPORT
uint32_t pw_protocol_native0_type_to_v2(struct pw_impl_client *client,
const struct spa_type_info *info, uint32_t type)
{
const char *name;
/** find full name of type in type_info */
if ((name = spa_debug_type_find_name(info, type)) == NULL)
return SPA_ID_INVALID;
return pw_protocol_native0_name_to_v2(client, name);
}
struct spa_pod_prop_body0 {
uint32_t key;
#define SPA_POD_PROP0_RANGE_NONE 0 /**< no range */
@ -540,7 +546,8 @@ static int remap_to_v2(struct pw_impl_client *client, const struct spa_type_info
ti = spa_debug_type_find(info, b->type);
ii = ti ? spa_debug_type_find(ti->values, 0) : NULL;
if (b->type == SPA_TYPE_COMMAND_Node) {
if (b->type == SPA_TYPE_COMMAND_Node ||
b->type == SPA_TYPE_EVENT_Node) {
spa_pod_builder_push_object(builder, &f[0], 0,
pw_protocol_native0_type_to_v2(client, ii ? ii->values : NULL, b->id));
} else {
@ -654,7 +661,6 @@ struct spa_pod * pw_protocol_native0_pod_from_v2(struct pw_impl_client *client,
return NULL;
}
copy = spa_pod_copy(b.data);
spa_debug_pod(0, NULL, copy);
return copy;
}

10
src/modules/module-protocol-native/v0/typemap.h
View file

@ -60,10 +60,10 @@ const struct type_info {
{ "Spa:Enum:DataType:MemPtr", SPA_TYPE_INFO_DATA_BASE "MemPtr", SPA_DATA_MemPtr, },
{ "Spa:Enum:DataType:Fd:MemFd", SPA_TYPE_INFO_DATA_FD_BASE "MemFd", SPA_DATA_MemFd, },
{ "Spa:Enum:DataType:Fd:DmaBuf", SPA_TYPE_INFO_DATA_FD_BASE "DmaBuf", SPA_DATA_DmaBuf, },
{ "Spa:POD:Object:Event:Node:Error", },
{ "Spa:POD:Object:Event:Node:Buffering", },
{ "Spa:POD:Object:Event:Node:RequestRefresh", },
{ "Spa:POD:Object:Event:Node:RequestClockUpdate", },
{ "Spa:POD:Object:Event:Node:Error", SPA_TYPE_INFO_NODE_EVENT_BASE "Error", SPA_NODE_EVENT_Error, },
{ "Spa:POD:Object:Event:Node:Buffering", SPA_TYPE_INFO_NODE_EVENT_BASE "Buffering", SPA_NODE_EVENT_Buffering, },
{ "Spa:POD:Object:Event:Node:RequestRefresh", SPA_TYPE_INFO_NODE_EVENT_BASE "RequestRefresh", SPA_NODE_EVENT_RequestRefresh, },
{ "Spa:POD:Object:Event:Node:RequestClockUpdate", SPA_TYPE_INFO_NODE_EVENT_BASE "RequestClockUpdate", SPA_NODE0_EVENT_RequestClockUpdate, },
{ "Spa:POD:Object:Command:Node", SPA_TYPE_INFO_COMMAND_BASE "Node", SPA_TYPE_COMMAND_Node,},
{ "Spa:POD:Object:Command:Node:Suspend", SPA_TYPE_INFO_NODE_COMMAND_BASE "Suspend", SPA_NODE_COMMAND_Suspend,},
{ "Spa:POD:Object:Command:Node:Pause", SPA_TYPE_INFO_NODE_COMMAND_BASE "Pause", SPA_NODE_COMMAND_Pause, },
@ -73,7 +73,7 @@ const struct type_info {
{ "Spa:POD:Object:Command:Node:Flush", SPA_TYPE_INFO_NODE_COMMAND_BASE "Flush", SPA_NODE_COMMAND_Flush, },
{ "Spa:POD:Object:Command:Node:Drain", SPA_TYPE_INFO_NODE_COMMAND_BASE "Drain", SPA_NODE_COMMAND_Drain, },
{ "Spa:POD:Object:Command:Node:Marker", SPA_TYPE_INFO_NODE_COMMAND_BASE "Marker", SPA_NODE_COMMAND_Marker, },
{ "Spa:POD:Object:Command:Node:ClockUpdate", },
{ "Spa:POD:Object:Command:Node:ClockUpdate", SPA_TYPE_INFO_NODE_COMMAND_BASE "ClockUpdate", SPA_NODE0_COMMAND_ClockUpdate, },
{ "Spa:POD:Object:Event:Monitor:Added", },
{ "Spa:POD:Object:Event:Monitor:Removed", },
{ "Spa:POD:Object:Event:Monitor:Changed", },