pw_module_proxy -> pw_module

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

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

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,