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

pw_module_proxy -> pw_module

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 15:16:30 +01:00
parent e633e205c2
commit 199fa47216
10 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/modules/module-protocol-native/protocol-native.c
View file

@ -730,7 +730,7 @@ static int registry_demarshal_destroy(void *object, const struct pw_protocol_nat
static int module_method_marshal_add_listener(void *object,
struct spa_hook *listener,
const struct pw_module_proxy_events *events,
const struct pw_module_events *events,
void *data)
{
struct pw_proxy *proxy = object;
@ -744,7 +744,7 @@ static void module_marshal_info(void *object, const struct pw_module_info *info)
struct spa_pod_builder *b;
struct spa_pod_frame f;
b = pw_protocol_native_begin_resource(resource, PW_MODULE_PROXY_EVENT_INFO, NULL);
b = pw_protocol_native_begin_resource(resource, PW_MODULE_EVENT_INFO, NULL);
spa_pod_builder_push_struct(b, &f);
spa_pod_builder_add(b,
@ -788,7 +788,7 @@ static int module_demarshal_info(void *object, const struct pw_protocol_native_m
if (parse_dict(&prs, &props) < 0)
return -EINVAL;
return pw_proxy_notify(proxy, struct pw_module_proxy_events, info, 0, &info);
return pw_proxy_notify(proxy, struct pw_module_events, info, 0, &info);
}
static int device_method_marshal_add_listener(void *object,
@ -1993,35 +1993,35 @@ const struct pw_protocol_marshal pw_protocol_native_registry_marshal = {
.client_demarshal = pw_protocol_native_registry_event_demarshal,
};
static const struct pw_module_proxy_events pw_protocol_native_module_event_marshal = {
PW_VERSION_MODULE_PROXY_EVENTS,
static const struct pw_module_events pw_protocol_native_module_event_marshal = {
PW_VERSION_MODULE_EVENTS,
.info = &module_marshal_info,
};
static const struct pw_protocol_native_demarshal
pw_protocol_native_module_event_demarshal[PW_MODULE_PROXY_EVENT_NUM] =
pw_protocol_native_module_event_demarshal[PW_MODULE_EVENT_NUM] =
{
[PW_MODULE_PROXY_EVENT_INFO] = { &module_demarshal_info, 0, },
[PW_MODULE_EVENT_INFO] = { &module_demarshal_info, 0, },
};
static const struct pw_module_proxy_methods pw_protocol_native_module_method_marshal = {
PW_VERSION_MODULE_PROXY_METHODS,
static const struct pw_module_methods pw_protocol_native_module_method_marshal = {
PW_VERSION_MODULE_METHODS,
.add_listener = &module_method_marshal_add_listener,
};
static const struct pw_protocol_native_demarshal
pw_protocol_native_module_method_demarshal[PW_MODULE_PROXY_METHOD_NUM] =
pw_protocol_native_module_method_demarshal[PW_MODULE_METHOD_NUM] =
{
[PW_MODULE_PROXY_METHOD_ADD_LISTENER] = { NULL, 0, },
[PW_MODULE_METHOD_ADD_LISTENER] = { NULL, 0, },
};
const struct pw_protocol_marshal pw_protocol_native_module_marshal = {
PW_TYPE_INTERFACE_Module,
PW_VERSION_MODULE_PROXY,
PW_VERSION_MODULE,
0,
PW_MODULE_PROXY_METHOD_NUM,
PW_MODULE_PROXY_EVENT_NUM,
PW_MODULE_METHOD_NUM,
PW_MODULE_EVENT_NUM,
.client_marshal = &pw_protocol_native_module_method_marshal,
.server_demarshal = pw_protocol_native_module_method_demarshal,
.server_marshal = &pw_protocol_native_module_event_marshal,

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

@ -337,12 +337,12 @@ struct pw_registry_v0_events {
#define PW_VERSION_MODULE_V0 0
#define PW_MODULE_PROXY_V0_EVENT_INFO 0
#define PW_MODULE_PROXY_V0_EVENT_NUM 1
#define PW_MODULE_V0_EVENT_INFO 0
#define PW_MODULE_V0_EVENT_NUM 1
/** Module events */
struct pw_module_proxy_v0_events {
#define PW_VERSION_MODULE_PROXY_V0_EVENTS 0
struct pw_module_v0_events {
#define PW_VERSION_MODULE_V0_EVENTS 0
uint32_t version;
/**
* Notify module info
@ -352,7 +352,7 @@ struct pw_module_proxy_v0_events {
void (*info) (void *object, struct pw_module_info *info);
};
#define pw_module_resource_v0_info(r,...) pw_resource_notify(r,struct pw_module_proxy_v0_events,info,__VA_ARGS__)
#define pw_module_resource_v0_info(r,...) pw_resource_notify(r,struct pw_module_v0_events,info,__VA_ARGS__)
#define PW_VERSION_NODE_V0 0

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

@ -759,7 +759,7 @@ static void module_marshal_info(void *object, const struct pw_module_info *info)
struct spa_pod_frame f;
uint32_t i, n_items;
b = pw_protocol_native_begin_resource(resource, PW_MODULE_PROXY_V0_EVENT_INFO, NULL);
b = pw_protocol_native_begin_resource(resource, PW_MODULE_V0_EVENT_INFO, NULL);
n_items = info->props ? info->props->n_items : 0;
@ -1071,8 +1071,8 @@ static const struct pw_protocol_marshal pw_protocol_native_registry_marshal = {
NULL
};
static const struct pw_module_proxy_events pw_protocol_native_module_event_marshal = {
PW_VERSION_MODULE_PROXY_EVENTS,
static const struct pw_module_events pw_protocol_native_module_event_marshal = {
PW_VERSION_MODULE_EVENTS,
.info = &module_marshal_info,
};
@ -1080,7 +1080,7 @@ static const struct pw_protocol_marshal pw_protocol_native_module_marshal = {
PW_TYPE_INTERFACE_Module,
PW_VERSION_MODULE_V0,
0,
PW_MODULE_PROXY_EVENT_NUM,
PW_MODULE_EVENT_NUM,
0,
NULL, NULL,
&pw_protocol_native_module_event_marshal,