pw_factory_proxy -> pw_factory

This commit is contained in:
Wim Taymans 2019-12-11 15:06:00 +01:00
parent f1eb5f6046
commit 114982f3f5
9 changed files with 57 additions and 57 deletions

View file

@ -466,14 +466,14 @@ struct pw_port_proxy_v0_methods {
const struct spa_pod *filter);
};
#define PW_VERSION_FACTORY_V0 0
#define PW_VERSION_FACTORY_V0 0
#define PW_FACTORY_PROXY_V0_EVENT_INFO 0
#define PW_FACTORY_PROXY_V0_EVENT_NUM 1
#define PW_FACTORY_V0_EVENT_INFO 0
#define PW_FACTORY_V0_EVENT_NUM 1
/** Factory events */
struct pw_factory_proxy_v0_events {
#define PW_VERSION_FACTORY_PROXY_V0_EVENTS 0
struct pw_factory_v0_events {
#define PW_VERSION_FACTORY_V0_EVENTS 0
uint32_t version;
/**
* Notify factory info
@ -483,9 +483,9 @@ struct pw_factory_proxy_v0_events {
void (*info) (void *object, struct pw_factory_info *info);
};
#define pw_factory_resource_v0_info(r,...) pw_resource_notify(r,struct pw_factory_proxy_v0_events,info,__VA_ARGS__)
#define pw_factory_resource_v0_info(r,...) pw_resource_notify(r,struct pw_factory_v0_events,info,__VA_ARGS__)
#define PW_VERSION_CLIENT_V0 0
#define PW_VERSION_CLIENT_V0 0
#define PW_CLIENT_V0_EVENT_INFO 0
#define PW_CLIENT_V0_EVENT_NUM 1

View file

@ -790,7 +790,7 @@ static void factory_marshal_info(void *object, const struct pw_factory_info *inf
struct spa_pod_frame f;
uint32_t i, n_items, type, version;
b = pw_protocol_native_begin_resource(resource, PW_FACTORY_PROXY_V0_EVENT_INFO, NULL);
b = pw_protocol_native_begin_resource(resource, PW_FACTORY_V0_EVENT_INFO, NULL);
n_items = info->props ? info->props->n_items : 0;
@ -1087,8 +1087,8 @@ static const struct pw_protocol_marshal pw_protocol_native_module_marshal = {
NULL
};
static const struct pw_factory_proxy_events pw_protocol_native_factory_event_marshal = {
PW_VERSION_FACTORY_PROXY_EVENTS,
static const struct pw_factory_events pw_protocol_native_factory_event_marshal = {
PW_VERSION_FACTORY_EVENTS,
.info = &factory_marshal_info,
};
@ -1096,7 +1096,7 @@ static const struct pw_protocol_marshal pw_protocol_native_factory_marshal = {
PW_TYPE_INTERFACE_Factory,
PW_VERSION_FACTORY_V0,
0,
PW_FACTORY_PROXY_EVENT_NUM,
PW_FACTORY_EVENT_NUM,
0,
NULL, NULL,
&pw_protocol_native_factory_event_marshal,