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_link_proxy -> pw_link

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 15:11:56 +01:00
parent 114982f3f5
commit e633e205c2
13 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pipewire-jack/src/pipewire-jack.c
View file

@ -3422,7 +3422,7 @@ int jack_connect (jack_client_t *client,
pw_core_create_object(c->core, pw_core_create_object(c->core,
"link-factory", "link-factory",
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
&props, &props,
0); 0);
res = do_sync(c); res = do_sync(c);

2
src/examples/local-v4l2.c
View file

@ -386,7 +386,7 @@ static int make_nodes(struct data *data)
pw_core_create_object(data->core, pw_core_create_object(data->core,
"link-factory", "link-factory",
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
&props->dict, 0); &props->dict, 0);
pw_properties_free(props); pw_properties_free(props);

2
src/examples/media-session/media-session.c
View file

@ -1332,7 +1332,7 @@ static int link_nodes(struct impl *impl, struct endpoint_link *link,
p = pw_core_create_object(impl->policy_core, p = pw_core_create_object(impl->policy_core,
"link-factory", "link-factory",
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
&props->dict, sizeof(struct link)); &props->dict, sizeof(struct link));
if (p == NULL) if (p == NULL)
return -errno; return -errno;

4
src/modules/module-link-factory.c
View file

@ -118,7 +118,7 @@ static void link_initialized(void *data)
ld->global = pw_impl_link_get_global(ld->link); ld->global = pw_impl_link_get_global(ld->link);
pw_global_add_listener(ld->global, &ld->global_listener, &global_events, ld); pw_global_add_listener(ld->global, &ld->global_listener, &global_events, ld);
res = pw_global_bind(ld->global, client, PW_PERM_RWX, PW_VERSION_LINK_PROXY, ld->new_id); res = pw_global_bind(ld->global, client, PW_PERM_RWX, PW_VERSION_LINK, ld->new_id);
if (res < 0) if (res < 0)
goto error_bind; goto error_bind;
@ -371,7 +371,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
factory = pw_impl_factory_new(context, factory = pw_impl_factory_new(context,
"link-factory", "link-factory",
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
pw_properties_new( pw_properties_new(
PW_KEY_FACTORY_USAGE, FACTORY_USAGE, PW_KEY_FACTORY_USAGE, FACTORY_USAGE,
NULL), NULL),

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

@ -1741,7 +1741,7 @@ static int client_demarshal_update_permissions(void *object, const struct pw_pro
static int link_method_marshal_add_listener(void *object, static int link_method_marshal_add_listener(void *object,
struct spa_hook *listener, struct spa_hook *listener,
const struct pw_link_proxy_events *events, const struct pw_link_events *events,
void *data) void *data)
{ {
struct pw_proxy *proxy = object; struct pw_proxy *proxy = object;
@ -1755,7 +1755,7 @@ static void link_marshal_info(void *object, const struct pw_link_info *info)
struct spa_pod_builder *b; struct spa_pod_builder *b;
struct spa_pod_frame f; struct spa_pod_frame f;
b = pw_protocol_native_begin_resource(resource, PW_LINK_PROXY_EVENT_INFO, NULL); b = pw_protocol_native_begin_resource(resource, PW_LINK_EVENT_INFO, NULL);
spa_pod_builder_push_struct(b, &f); spa_pod_builder_push_struct(b, &f);
spa_pod_builder_add(b, spa_pod_builder_add(b,
@ -1807,7 +1807,7 @@ static int link_demarshal_info(void *object, const struct pw_protocol_native_mes
if (parse_dict(&prs, &props) < 0) if (parse_dict(&prs, &props) < 0)
return -EINVAL; return -EINVAL;
return pw_proxy_notify(proxy, struct pw_link_proxy_events, info, 0, &info); return pw_proxy_notify(proxy, struct pw_link_events, info, 0, &info);
} }
static int registry_demarshal_global(void *object, const struct pw_protocol_native_message *msg) static int registry_demarshal_global(void *object, const struct pw_protocol_native_message *msg)
@ -2229,34 +2229,34 @@ static const struct pw_protocol_marshal pw_protocol_native_client_marshal = {
}; };
static const struct pw_link_proxy_methods pw_protocol_native_link_method_marshal = { static const struct pw_link_methods pw_protocol_native_link_method_marshal = {
PW_VERSION_LINK_PROXY_METHODS, PW_VERSION_LINK_METHODS,
.add_listener = &link_method_marshal_add_listener, .add_listener = &link_method_marshal_add_listener,
}; };
static const struct pw_protocol_native_demarshal static const struct pw_protocol_native_demarshal
pw_protocol_native_link_method_demarshal[PW_LINK_PROXY_METHOD_NUM] = pw_protocol_native_link_method_demarshal[PW_LINK_METHOD_NUM] =
{ {
[PW_LINK_PROXY_METHOD_ADD_LISTENER] = { NULL, 0, }, [PW_LINK_METHOD_ADD_LISTENER] = { NULL, 0, },
}; };
static const struct pw_link_proxy_events pw_protocol_native_link_event_marshal = { static const struct pw_link_events pw_protocol_native_link_event_marshal = {
PW_VERSION_LINK_PROXY_EVENTS, PW_VERSION_LINK_EVENTS,
.info = &link_marshal_info, .info = &link_marshal_info,
}; };
static const struct pw_protocol_native_demarshal static const struct pw_protocol_native_demarshal
pw_protocol_native_link_event_demarshal[PW_LINK_PROXY_EVENT_NUM] = pw_protocol_native_link_event_demarshal[PW_LINK_EVENT_NUM] =
{ {
[PW_LINK_PROXY_EVENT_INFO] = { &link_demarshal_info, 0, } [PW_LINK_EVENT_INFO] = { &link_demarshal_info, 0, }
}; };
static const struct pw_protocol_marshal pw_protocol_native_link_marshal = { static const struct pw_protocol_marshal pw_protocol_native_link_marshal = {
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
0, 0,
PW_LINK_PROXY_METHOD_NUM, PW_LINK_METHOD_NUM,
PW_LINK_PROXY_EVENT_NUM, PW_LINK_EVENT_NUM,
.client_marshal = &pw_protocol_native_link_method_marshal, .client_marshal = &pw_protocol_native_link_method_marshal,
.server_demarshal = pw_protocol_native_link_method_demarshal, .server_demarshal = pw_protocol_native_link_method_demarshal,
.server_marshal = &pw_protocol_native_link_event_marshal, .server_marshal = &pw_protocol_native_link_event_marshal,

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

@ -507,12 +507,12 @@ struct pw_client_v0_events {
#define PW_VERSION_LINK_V0 0 #define PW_VERSION_LINK_V0 0
#define PW_LINK_PROXY_V0_EVENT_INFO 0 #define PW_LINK_V0_EVENT_INFO 0
#define PW_LINK_PROXY_V0_EVENT_NUM 1 #define PW_LINK_V0_EVENT_NUM 1
/** Link events */ /** Link events */
struct pw_link_proxy_v0_events { struct pw_link_v0_events {
#define PW_VERSION_LINK_PROXY_V0_EVENTS 0 #define PW_VERSION_LINK_V0_EVENTS 0
uint32_t version; uint32_t version;
/** /**
* Notify link info * Notify link info
@ -522,7 +522,7 @@ struct pw_link_proxy_v0_events {
void (*info) (void *object, struct pw_link_info *info); void (*info) (void *object, struct pw_link_info *info);
}; };
#define pw_link_resource_v0_info(r,...) pw_resource_notify(r,struct pw_link_proxy_v0_events,info,__VA_ARGS__) #define pw_link_resource_v0_info(r,...) pw_resource_notify(r,struct pw_link_v0_events,info,__VA_ARGS__)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

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

@ -993,7 +993,7 @@ static void link_marshal_info(void *object, const struct pw_link_info *info)
struct spa_pod_frame f; struct spa_pod_frame f;
uint32_t i, n_items; uint32_t i, n_items;
b = pw_protocol_native_begin_resource(resource, PW_LINK_PROXY_V0_EVENT_INFO, NULL); b = pw_protocol_native_begin_resource(resource, PW_LINK_V0_EVENT_INFO, NULL);
n_items = info->props ? info->props->n_items : 0; n_items = info->props ? info->props->n_items : 0;
@ -1165,8 +1165,8 @@ static const struct pw_protocol_marshal pw_protocol_native_client_marshal = {
NULL, NULL,
}; };
static const struct pw_link_proxy_events pw_protocol_native_link_event_marshal = { static const struct pw_link_events pw_protocol_native_link_event_marshal = {
PW_VERSION_LINK_PROXY_EVENTS, PW_VERSION_LINK_EVENTS,
.info = &link_marshal_info, .info = &link_marshal_info,
}; };
@ -1174,7 +1174,7 @@ static const struct pw_protocol_marshal pw_protocol_native_link_marshal = {
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_V0, PW_VERSION_LINK_V0,
0, 0,
PW_LINK_PROXY_EVENT_NUM, PW_LINK_EVENT_NUM,
0, 0,
NULL, NULL, NULL, NULL,
&pw_protocol_native_link_event_marshal, &pw_protocol_native_link_event_marshal,

4
src/pipewire/impl-link.c
View file

@ -41,7 +41,7 @@
#define NAME "link" #define NAME "link"
#define pw_link_resource_info(r,...) pw_resource_call(r,struct pw_link_proxy_events,info,0,__VA_ARGS__) #define pw_link_resource_info(r,...) pw_resource_call(r,struct pw_link_events,info,0,__VA_ARGS__)
/** \cond */ /** \cond */
struct impl { struct impl {
@ -1230,7 +1230,7 @@ int pw_impl_link_register(struct pw_impl_link *link,
link->global = pw_global_new(context, link->global = pw_global_new(context,
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
properties, properties,
global_bind, global_bind,
link); link);

28
src/pipewire/link.h
View file

@ -34,8 +34,8 @@ extern "C" {
#include <pipewire/proxy.h> #include <pipewire/proxy.h>
#define PW_VERSION_LINK_PROXY 3 #define PW_VERSION_LINK 3
struct pw_link_proxy; struct pw_link;
/** \enum pw_link_state The different link states \memberof pw_link */ /** \enum pw_link_state The different link states \memberof pw_link */
enum pw_link_state { enum pw_link_state {
@ -75,12 +75,12 @@ void
pw_link_info_free(struct pw_link_info *info); pw_link_info_free(struct pw_link_info *info);
#define PW_LINK_PROXY_EVENT_INFO 0 #define PW_LINK_EVENT_INFO 0
#define PW_LINK_PROXY_EVENT_NUM 1 #define PW_LINK_EVENT_NUM 1
/** Link events */ /** Link events */
struct pw_link_proxy_events { struct pw_link_events {
#define PW_VERSION_LINK_PROXY_EVENTS 0 #define PW_VERSION_LINK_EVENTS 0
uint32_t version; uint32_t version;
/** /**
* Notify link info * Notify link info
@ -90,30 +90,30 @@ struct pw_link_proxy_events {
void (*info) (void *object, const struct pw_link_info *info); void (*info) (void *object, const struct pw_link_info *info);
}; };
#define PW_LINK_PROXY_METHOD_ADD_LISTENER 0 #define PW_LINK_METHOD_ADD_LISTENER 0
#define PW_LINK_PROXY_METHOD_NUM 1 #define PW_LINK_METHOD_NUM 1
/** Link methods */ /** Link methods */
struct pw_link_proxy_methods { struct pw_link_methods {
#define PW_VERSION_LINK_PROXY_METHODS 0 #define PW_VERSION_LINK_METHODS 0
uint32_t version; uint32_t version;
int (*add_listener) (void *object, int (*add_listener) (void *object,
struct spa_hook *listener, struct spa_hook *listener,
const struct pw_link_proxy_events *events, const struct pw_link_events *events,
void *data); void *data);
}; };
#define pw_link_proxy_method(o,method,version,...) \ #define pw_link_method(o,method,version,...) \
({ \ ({ \
int _res = -ENOTSUP; \ int _res = -ENOTSUP; \
spa_interface_call_res((struct spa_interface*)o, \ spa_interface_call_res((struct spa_interface*)o, \
struct pw_link_proxy_methods, _res, \ struct pw_link_methods, _res, \
method, version, ##__VA_ARGS__); \ method, version, ##__VA_ARGS__); \
_res; \ _res; \
}) })
#define pw_link_proxy_add_listener(c,...) pw_link_proxy_method(c,add_listener,0,__VA_ARGS__) #define pw_link_add_listener(c,...) pw_link_method(c,add_listener,0,__VA_ARGS__)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

14
src/tests/test-interfaces.c
View file

@ -336,28 +336,28 @@ static void test_client_abi(void)
static void test_link_abi(void) static void test_link_abi(void)
{ {
struct pw_link_proxy_methods m; struct pw_link_methods m;
struct pw_link_proxy_events e; struct pw_link_events e;
struct { struct {
uint32_t version; uint32_t version;
int (*add_listener) (void *object, int (*add_listener) (void *object,
struct spa_hook *listener, struct spa_hook *listener,
const struct pw_link_proxy_events *events, const struct pw_link_events *events,
void *data); void *data);
} methods = { PW_VERSION_LINK_PROXY_METHODS, }; } methods = { PW_VERSION_LINK_METHODS, };
struct { struct {
uint32_t version; uint32_t version;
void (*info) (void *object, const struct pw_link_info *info); void (*info) (void *object, const struct pw_link_info *info);
} events = { PW_VERSION_LINK_PROXY_EVENTS, }; } events = { PW_VERSION_LINK_EVENTS, };
TEST_FUNC(m, methods, version); TEST_FUNC(m, methods, version);
TEST_FUNC(m, methods, add_listener); TEST_FUNC(m, methods, add_listener);
spa_assert(PW_VERSION_LINK_PROXY_METHODS == 0); spa_assert(PW_VERSION_LINK_METHODS == 0);
spa_assert(sizeof(m) == sizeof(methods)); spa_assert(sizeof(m) == sizeof(methods));
TEST_FUNC(e, events, version); TEST_FUNC(e, events, version);
TEST_FUNC(e, events, info); TEST_FUNC(e, events, info);
spa_assert(PW_VERSION_LINK_PROXY_EVENTS == 0); spa_assert(PW_VERSION_LINK_EVENTS == 0);
spa_assert(sizeof(e) == sizeof(events)); spa_assert(sizeof(e) == sizeof(events));
} }

8
src/tools/pipewire-cli.c
View file

@ -871,8 +871,8 @@ static void link_event_info(void *object, const struct pw_link_info *info)
} }
} }
static const struct pw_link_proxy_events link_events = { static const struct pw_link_events link_events = {
PW_VERSION_LINK_PROXY_EVENTS, PW_VERSION_LINK_EVENTS,
.info = link_event_info .info = link_event_info
}; };
@ -1134,7 +1134,7 @@ static bool bind_global(struct remote_data *rd, struct global *global, char **er
break; break;
case PW_TYPE_INTERFACE_Link: case PW_TYPE_INTERFACE_Link:
events = &link_events; events = &link_events;
client_version = PW_VERSION_LINK_PROXY; client_version = PW_VERSION_LINK;
destroy = (pw_destroy_t) pw_link_info_free; destroy = (pw_destroy_t) pw_link_info_free;
info_func = info_link; info_func = info_link;
break; break;
@ -1366,7 +1366,7 @@ static bool do_create_link(struct data *data, const char *cmd, char *args, char
proxy = (struct pw_proxy*)pw_core_create_object(rd->core, proxy = (struct pw_proxy*)pw_core_create_object(rd->core,
"link-factory", "link-factory",
PW_TYPE_INTERFACE_Link, PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY, PW_VERSION_LINK,
props ? &props->dict : NULL, props ? &props->dict : NULL,
sizeof(struct proxy_data)); sizeof(struct proxy_data));

6
src/tools/pipewire-dot.c
View file

@ -531,8 +531,8 @@ static void link_event_info(void *data, const struct pw_link_info *info)
global_event_info(data, info); global_event_info(data, info);
} }
static const struct pw_link_proxy_events link_events = { static const struct pw_link_events link_events = {
PW_VERSION_LINK_PROXY_EVENTS, PW_VERSION_LINK_EVENTS,
.info = link_event_info .info = link_event_info
}; };
@ -629,7 +629,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
info_destroy = (pw_destroy_t)pw_link_info_free; info_destroy = (pw_destroy_t)pw_link_info_free;
info_update = (info_update_t)pw_link_info_update; info_update = (info_update_t)pw_link_info_update;
draw = draw_link; draw = draw_link;
client_version = PW_VERSION_LINK_PROXY; client_version = PW_VERSION_LINK;
break; break;
case PW_TYPE_INTERFACE_Client: case PW_TYPE_INTERFACE_Client:
events = &client_events; events = &client_events;

6
src/tools/pipewire-monitor.c
View file

@ -476,8 +476,8 @@ static void link_event_info(void *object, const struct pw_link_info *info)
} }
} }
static const struct pw_link_proxy_events link_events = { static const struct pw_link_events link_events = {
PW_VERSION_LINK_PROXY_EVENTS, PW_VERSION_LINK_EVENTS,
.info = link_event_info .info = link_event_info
}; };
@ -611,7 +611,7 @@ static void registry_event_global(void *data, uint32_t id,
break; break;
case PW_TYPE_INTERFACE_Link: case PW_TYPE_INTERFACE_Link:
events = &link_events; events = &link_events;
client_version = PW_VERSION_LINK_PROXY; client_version = PW_VERSION_LINK;
destroy = (pw_destroy_t) pw_link_info_free; destroy = (pw_destroy_t) pw_link_info_free;
break; break;
default: default: