From 3805d5dfa22738facf48db49d26101f5c0b95c32 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 11 Dec 2019 16:48:00 +0100 Subject: [PATCH] pw_endpoint_stream_proxy -> pw_endpoint_stream --- src/examples/media-session/media-session.c | 8 +-- src/extensions/session-manager/interfaces.h | 42 +++++++-------- .../module-session-manager/endpoint-stream.c | 8 +-- .../module-session-manager/protocol-native.c | 52 +++++++++---------- src/tools/pipewire-cli.c | 6 +-- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index c55451c82..8a7aaea7a 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -765,8 +765,8 @@ static void endpoint_stream_event_info(void *object, const struct pw_endpoint_st pw_proxy_sync(stream->obj.proxy, 1); } -static const struct pw_endpoint_stream_proxy_events endpoint_stream_events = { - PW_VERSION_ENDPOINT_STREAM_PROXY_EVENTS, +static const struct pw_endpoint_stream_events endpoint_stream_events = { + PW_VERSION_ENDPOINT_STREAM_EVENTS, .info = endpoint_stream_event_info, }; @@ -808,7 +808,7 @@ static void endpoint_stream_destroy(void *object) static const struct object_info endpoint_stream_info = { .type = PW_TYPE_INTERFACE_EndpointStream, - .version = PW_VERSION_ENDPOINT_STREAM_PROXY, + .version = PW_VERSION_ENDPOINT_STREAM, .events = &endpoint_stream_events, .size = sizeof(struct sm_endpoint_stream), .init = endpoint_stream_init, @@ -866,7 +866,7 @@ static void endpoint_link_destroy(void *object) static const struct object_info endpoint_link_info = { .type = PW_TYPE_INTERFACE_EndpointLink, - .version = PW_VERSION_ENDPOINT_STREAM_PROXY, + .version = PW_VERSION_ENDPOINT_LINK, .events = &endpoint_link_events, .size = sizeof(struct sm_endpoint_link), .init = NULL, diff --git a/src/extensions/session-manager/interfaces.h b/src/extensions/session-manager/interfaces.h index 024b6af5a..8fceb437a 100644 --- a/src/extensions/session-manager/interfaces.h +++ b/src/extensions/session-manager/interfaces.h @@ -39,8 +39,8 @@ extern "C" { struct pw_session; #define PW_VERSION_ENDPOINT 0 struct pw_endpoint; -#define PW_VERSION_ENDPOINT_STREAM_PROXY 0 -struct pw_endpoint_stream_proxy; +#define PW_VERSION_ENDPOINT_STREAM 0 +struct pw_endpoint_stream; #define PW_VERSION_ENDPOINT_LINK 0 struct pw_endpoint_link; @@ -252,12 +252,12 @@ struct pw_endpoint_methods { /* Endpoint Stream */ -#define PW_ENDPOINT_STREAM_PROXY_EVENT_INFO 0 -#define PW_ENDPOINT_STREAM_PROXY_EVENT_PARAM 1 -#define PW_ENDPOINT_STREAM_PROXY_EVENT_NUM 2 +#define PW_ENDPOINT_STREAM_EVENT_INFO 0 +#define PW_ENDPOINT_STREAM_EVENT_PARAM 1 +#define PW_ENDPOINT_STREAM_EVENT_NUM 2 -struct pw_endpoint_stream_proxy_events { -#define PW_VERSION_ENDPOINT_STREAM_PROXY_EVENTS 0 +struct pw_endpoint_stream_events { +#define PW_VERSION_ENDPOINT_STREAM_EVENTS 0 uint32_t version; /**< version of this structure */ /** @@ -283,19 +283,19 @@ struct pw_endpoint_stream_proxy_events { const struct spa_pod *param); }; -#define PW_ENDPOINT_STREAM_PROXY_METHOD_ADD_LISTENER 0 -#define PW_ENDPOINT_STREAM_PROXY_METHOD_SUBSCRIBE_PARAMS 1 -#define PW_ENDPOINT_STREAM_PROXY_METHOD_ENUM_PARAMS 2 -#define PW_ENDPOINT_STREAM_PROXY_METHOD_SET_PARAM 3 -#define PW_ENDPOINT_STREAM_PROXY_METHOD_NUM 4 +#define PW_ENDPOINT_STREAM_METHOD_ADD_LISTENER 0 +#define PW_ENDPOINT_STREAM_METHOD_SUBSCRIBE_PARAMS 1 +#define PW_ENDPOINT_STREAM_METHOD_ENUM_PARAMS 2 +#define PW_ENDPOINT_STREAM_METHOD_SET_PARAM 3 +#define PW_ENDPOINT_STREAM_METHOD_NUM 4 -struct pw_endpoint_stream_proxy_methods { -#define PW_VERSION_ENDPOINT_STREAM_PROXY_METHODS 0 +struct pw_endpoint_stream_methods { +#define PW_VERSION_ENDPOINT_STREAM_METHODS 0 uint32_t version; /**< version of this structure */ int (*add_listener) (void *object, struct spa_hook *listener, - const struct pw_endpoint_stream_proxy_events *events, + const struct pw_endpoint_stream_events *events, void *data); /** @@ -336,19 +336,19 @@ struct pw_endpoint_stream_proxy_methods { const struct spa_pod *param); }; -#define pw_endpoint_stream_proxy_method(o,method,version,...) \ +#define pw_endpoint_stream_method(o,method,version,...) \ ({ \ int _res = -ENOTSUP; \ spa_interface_call_res((struct spa_interface*)o, \ - struct pw_endpoint_stream_proxy_methods, _res, \ + struct pw_endpoint_stream_methods, _res, \ method, version, ##__VA_ARGS__); \ _res; \ }) -#define pw_endpoint_stream_proxy_add_listener(c,...) pw_endpoint_stream_proxy_method(c,add_listener,0,__VA_ARGS__) -#define pw_endpoint_stream_proxy_subscribe_params(c,...) pw_endpoint_stream_proxy_method(c,subscribe_params,0,__VA_ARGS__) -#define pw_endpoint_stream_proxy_enum_params(c,...) pw_endpoint_stream_proxy_method(c,enum_params,0,__VA_ARGS__) -#define pw_endpoint_stream_proxy_set_param(c,...) pw_endpoint_stream_proxy_method(c,set_param,0,__VA_ARGS__) +#define pw_endpoint_stream_add_listener(c,...) pw_endpoint_stream_method(c,add_listener,0,__VA_ARGS__) +#define pw_endpoint_stream_subscribe_params(c,...) pw_endpoint_stream_method(c,subscribe_params,0,__VA_ARGS__) +#define pw_endpoint_stream_enum_params(c,...) pw_endpoint_stream_method(c,enum_params,0,__VA_ARGS__) +#define pw_endpoint_stream_set_param(c,...) pw_endpoint_stream_method(c,set_param,0,__VA_ARGS__) /* Endpoint Link */ diff --git a/src/modules/module-session-manager/endpoint-stream.c b/src/modules/module-session-manager/endpoint-stream.c index 35454063b..205b0d1a6 100644 --- a/src/modules/module-session-manager/endpoint-stream.c +++ b/src/modules/module-session-manager/endpoint-stream.c @@ -47,7 +47,7 @@ struct resource_data { }; #define pw_endpoint_stream_resource(r,m,v,...) \ - pw_resource_call(r,struct pw_endpoint_stream_proxy_events,m,v,__VA_ARGS__) + pw_resource_call(r,struct pw_endpoint_stream_events,m,v,__VA_ARGS__) #define pw_endpoint_stream_resource_info(r,...) \ pw_endpoint_stream_resource(r,info,0,__VA_ARGS__) #define pw_endpoint_stream_resource_param(r,...) \ @@ -123,8 +123,8 @@ static int endpoint_stream_set_param (void *object, uint32_t id, uint32_t flags, return 0; } -static const struct pw_endpoint_stream_proxy_methods methods = { - PW_VERSION_ENDPOINT_STREAM_PROXY_METHODS, +static const struct pw_endpoint_stream_methods methods = { + PW_VERSION_ENDPOINT_STREAM_METHODS, .subscribe_params = endpoint_stream_subscribe_params, .enum_params = endpoint_stream_enum_params, .set_param = endpoint_stream_set_param, @@ -293,7 +293,7 @@ int endpoint_stream_init(struct endpoint_stream *this, this->global = pw_global_new (context, PW_TYPE_INTERFACE_EndpointStream, - PW_VERSION_ENDPOINT_STREAM_PROXY, + PW_VERSION_ENDPOINT_STREAM, properties, endpoint_stream_bind, this); if (!this->global) goto no_mem; diff --git a/src/modules/module-session-manager/protocol-native.c b/src/modules/module-session-manager/protocol-native.c index 7110dc3f6..e017330a6 100644 --- a/src/modules/module-session-manager/protocol-native.c +++ b/src/modules/module-session-manager/protocol-native.c @@ -1245,7 +1245,7 @@ static void endpoint_stream_marshal_info (void *object, struct spa_pod_builder *b; b = pw_protocol_native_begin_resource(resource, - PW_ENDPOINT_STREAM_PROXY_EVENT_INFO, NULL); + PW_ENDPOINT_STREAM_EVENT_INFO, NULL); marshal_pw_endpoint_stream_info(b, info); @@ -1260,7 +1260,7 @@ static void endpoint_stream_marshal_param (void *object, int seq, uint32_t id, struct spa_pod_builder *b; b = pw_protocol_native_begin_resource(resource, - PW_ENDPOINT_STREAM_PROXY_EVENT_PARAM, NULL); + PW_ENDPOINT_STREAM_EVENT_PARAM, NULL); spa_pod_builder_add_struct(b, SPA_POD_Int(seq), @@ -1274,7 +1274,7 @@ static void endpoint_stream_marshal_param (void *object, int seq, uint32_t id, static int endpoint_stream_marshal_add_listener(void *object, struct spa_hook *listener, - const struct pw_endpoint_stream_proxy_events *events, + const struct pw_endpoint_stream_events *events, void *data) { struct pw_proxy *proxy = object; @@ -1289,7 +1289,7 @@ static int endpoint_stream_marshal_subscribe_params(void *object, struct spa_pod_builder *b; b = pw_protocol_native_begin_proxy(proxy, - PW_ENDPOINT_STREAM_PROXY_METHOD_SUBSCRIBE_PARAMS, NULL); + PW_ENDPOINT_STREAM_METHOD_SUBSCRIBE_PARAMS, NULL); spa_pod_builder_add_struct(b, SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, n_ids, ids)); @@ -1307,7 +1307,7 @@ static int endpoint_stream_marshal_enum_params(void *object, struct spa_pod_builder *b; b = pw_protocol_native_begin_proxy(proxy, - PW_ENDPOINT_STREAM_PROXY_METHOD_ENUM_PARAMS, &msg); + PW_ENDPOINT_STREAM_METHOD_ENUM_PARAMS, &msg); spa_pod_builder_add_struct(b, SPA_POD_Int(SPA_RESULT_RETURN_ASYNC(msg->seq)), @@ -1327,7 +1327,7 @@ static int endpoint_stream_marshal_set_param(void *object, struct spa_pod_builder *b; b = pw_protocol_native_begin_proxy(proxy, - PW_ENDPOINT_STREAM_PROXY_METHOD_SET_PARAM, NULL); + PW_ENDPOINT_STREAM_METHOD_SET_PARAM, NULL); spa_pod_builder_add_struct(b, SPA_POD_Id(id), @@ -1350,7 +1350,7 @@ static int endpoint_stream_demarshal_info(void *object, demarshal_pw_endpoint_stream_info(&prs, &f, &info); - return pw_proxy_notify(proxy, struct pw_endpoint_stream_proxy_events, + return pw_proxy_notify(proxy, struct pw_endpoint_stream_events, info, 0, &info); } @@ -1372,7 +1372,7 @@ static int endpoint_stream_demarshal_param(void *object, SPA_POD_Pod(¶m)) < 0) return -EINVAL; - return pw_proxy_notify(proxy, struct pw_endpoint_stream_proxy_events, + return pw_proxy_notify(proxy, struct pw_endpoint_stream_events, param, 0, seq, id, index, next, param); } @@ -1392,7 +1392,7 @@ static int endpoint_stream_demarshal_subscribe_params(void *object, if (ctype != SPA_TYPE_Id) return -EINVAL; - return pw_resource_notify(resource, struct pw_endpoint_stream_proxy_methods, + return pw_resource_notify(resource, struct pw_endpoint_stream_methods, subscribe_params, 0, ids, n_ids); } @@ -1414,7 +1414,7 @@ static int endpoint_stream_demarshal_enum_params(void *object, SPA_POD_Pod(&filter)) < 0) return -EINVAL; - return pw_resource_notify(resource, struct pw_endpoint_stream_proxy_methods, + return pw_resource_notify(resource, struct pw_endpoint_stream_methods, enum_params, 0, seq, id, index, num, filter); } @@ -1433,25 +1433,25 @@ static int endpoint_stream_demarshal_set_param(void *object, SPA_POD_Pod(¶m)) < 0) return -EINVAL; - return pw_resource_notify(resource, struct pw_endpoint_stream_proxy_methods, + return pw_resource_notify(resource, struct pw_endpoint_stream_methods, set_param, 0, id, flags, param); } -static const struct pw_endpoint_stream_proxy_events pw_protocol_native_endpoint_stream_event_marshal = { - PW_VERSION_ENDPOINT_STREAM_PROXY_EVENTS, +static const struct pw_endpoint_stream_events pw_protocol_native_endpoint_stream_event_marshal = { + PW_VERSION_ENDPOINT_STREAM_EVENTS, .info = endpoint_stream_marshal_info, .param = endpoint_stream_marshal_param, }; static const struct pw_protocol_native_demarshal -pw_protocol_native_endpoint_stream_event_demarshal[PW_ENDPOINT_STREAM_PROXY_EVENT_NUM] = +pw_protocol_native_endpoint_stream_event_demarshal[PW_ENDPOINT_STREAM_EVENT_NUM] = { - [PW_ENDPOINT_STREAM_PROXY_EVENT_INFO] = { endpoint_stream_demarshal_info, 0 }, - [PW_ENDPOINT_STREAM_PROXY_EVENT_PARAM] = { endpoint_stream_demarshal_param, 0 }, + [PW_ENDPOINT_STREAM_EVENT_INFO] = { endpoint_stream_demarshal_info, 0 }, + [PW_ENDPOINT_STREAM_EVENT_PARAM] = { endpoint_stream_demarshal_param, 0 }, }; -static const struct pw_endpoint_stream_proxy_methods pw_protocol_native_endpoint_stream_method_marshal = { - PW_VERSION_ENDPOINT_STREAM_PROXY_METHODS, +static const struct pw_endpoint_stream_methods pw_protocol_native_endpoint_stream_method_marshal = { + PW_VERSION_ENDPOINT_STREAM_METHODS, .add_listener = endpoint_stream_marshal_add_listener, .subscribe_params = endpoint_stream_marshal_subscribe_params, .enum_params = endpoint_stream_marshal_enum_params, @@ -1459,20 +1459,20 @@ static const struct pw_endpoint_stream_proxy_methods pw_protocol_native_endpoint }; static const struct pw_protocol_native_demarshal -pw_protocol_native_endpoint_stream_method_demarshal[PW_ENDPOINT_STREAM_PROXY_METHOD_NUM] = +pw_protocol_native_endpoint_stream_method_demarshal[PW_ENDPOINT_STREAM_METHOD_NUM] = { - [PW_ENDPOINT_STREAM_PROXY_METHOD_ADD_LISTENER] = { NULL, 0 }, - [PW_ENDPOINT_STREAM_PROXY_METHOD_SUBSCRIBE_PARAMS] = { endpoint_stream_demarshal_subscribe_params, 0 }, - [PW_ENDPOINT_STREAM_PROXY_METHOD_ENUM_PARAMS] = { endpoint_stream_demarshal_enum_params, 0 }, - [PW_ENDPOINT_STREAM_PROXY_METHOD_SET_PARAM] = { endpoint_stream_demarshal_set_param, PW_PERM_W }, + [PW_ENDPOINT_STREAM_METHOD_ADD_LISTENER] = { NULL, 0 }, + [PW_ENDPOINT_STREAM_METHOD_SUBSCRIBE_PARAMS] = { endpoint_stream_demarshal_subscribe_params, 0 }, + [PW_ENDPOINT_STREAM_METHOD_ENUM_PARAMS] = { endpoint_stream_demarshal_enum_params, 0 }, + [PW_ENDPOINT_STREAM_METHOD_SET_PARAM] = { endpoint_stream_demarshal_set_param, PW_PERM_W }, }; static const struct pw_protocol_marshal pw_protocol_native_endpoint_stream_marshal = { PW_TYPE_INTERFACE_EndpointStream, - PW_VERSION_ENDPOINT_STREAM_PROXY, + PW_VERSION_ENDPOINT_STREAM, 0, - PW_ENDPOINT_STREAM_PROXY_METHOD_NUM, - PW_ENDPOINT_STREAM_PROXY_EVENT_NUM, + PW_ENDPOINT_STREAM_METHOD_NUM, + PW_ENDPOINT_STREAM_EVENT_NUM, &pw_protocol_native_endpoint_stream_method_marshal, &pw_protocol_native_endpoint_stream_method_demarshal, &pw_protocol_native_endpoint_stream_event_marshal, diff --git a/src/tools/pipewire-cli.c b/src/tools/pipewire-cli.c index 8a93f7727..11fc2bdb5 100644 --- a/src/tools/pipewire-cli.c +++ b/src/tools/pipewire-cli.c @@ -1046,8 +1046,8 @@ static void endpoint_stream_event_info(void *object, } } -static const struct pw_endpoint_stream_proxy_events endpoint_stream_events = { - PW_VERSION_ENDPOINT_STREAM_PROXY_EVENTS, +static const struct pw_endpoint_stream_events endpoint_stream_events = { + PW_VERSION_ENDPOINT_STREAM_EVENTS, .info = endpoint_stream_event_info, .param = event_param }; @@ -1152,7 +1152,7 @@ static bool bind_global(struct remote_data *rd, struct global *global, char **er break; case PW_TYPE_INTERFACE_EndpointStream: events = &endpoint_stream_events; - client_version = PW_VERSION_ENDPOINT_STREAM_PROXY; + client_version = PW_VERSION_ENDPOINT_STREAM; destroy = (pw_destroy_t) endpoint_stream_info_free; info_func = info_endpoint_stream; break;