mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid shadowing arguments

Browse source
This commit is contained in:
Wim Taymans 2021-07-06 17:55:16 +02:00
parent 91f4e4d3c8
commit d88e8edd11
9 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-protocol-pulse/collect.c
View file

@ -238,7 +238,7 @@ void collect_device_info(struct pw_manager_object *device, struct pw_manager_obj
if (card && !monitor) {
spa_list_for_each(p, &card->param_list, link) {
uint32_t id, device;
uint32_t id, dev;
struct spa_pod *props;
if (p->id != SPA_PARAM_Route)
@ -247,10 +247,10 @@ void collect_device_info(struct pw_manager_object *device, struct pw_manager_obj
if (spa_pod_parse_object(p->param,
SPA_TYPE_OBJECT_ParamRoute, NULL,
SPA_PARAM_ROUTE_index, SPA_POD_Int(&id),
SPA_PARAM_ROUTE_device, SPA_POD_Int(&device),
SPA_PARAM_ROUTE_device, SPA_POD_Int(&dev),
SPA_PARAM_ROUTE_props, SPA_POD_OPT_Pod(&props)) < 0)
continue;
if (device != dev_info->device)
if (dev != dev_info->device)
continue;
dev_info->active_port = id;
if (props) {

4
src/modules/module-protocol-pulse/manager.c
View file

@ -375,10 +375,10 @@ static void device_event_param(void *object, int seq,
return;
if (id == SPA_PARAM_Route && !has_param(&o->this.param_list, p)) {
uint32_t id, device;
uint32_t idx, device;
if (spa_pod_parse_object(param,
SPA_TYPE_OBJECT_ParamRoute, NULL,
SPA_PARAM_ROUTE_index, SPA_POD_Int(&id),
SPA_PARAM_ROUTE_index, SPA_POD_Int(&idx),
SPA_PARAM_ROUTE_device, SPA_POD_Int(&device)) < 0)
return;

12
src/modules/module-protocol-pulse/server.c
View file

@ -305,9 +305,9 @@ on_client_data(void *data, int fd, uint32_t mask)
client->need_flush = false;
res = client_flush_messages(client);
if (res >= 0) {
int mask = client->source->mask;
SPA_FLAG_CLEAR(mask, SPA_IO_OUT);
pw_loop_update_io(impl->loop, client->source, mask);
int m = client->source->mask;
SPA_FLAG_CLEAR(m, SPA_IO_OUT);
pw_loop_update_io(impl->loop, client->source, m);
} else if (res != -EAGAIN && res != -EWOULDBLOCK)
goto error;
}
@ -361,9 +361,9 @@ on_connect(void *data, int fd, uint32_t mask)
if (client_fd < 0) {
if (errno == EMFILE || errno == ENFILE) {
if (server->n_clients > 0) {
int mask = server->source->mask;
SPA_FLAG_CLEAR(mask, SPA_IO_IN);
pw_loop_update_io(impl->loop, server->source, mask);
int m = server->source->mask;
SPA_FLAG_CLEAR(m, SPA_IO_IN);
pw_loop_update_io(impl->loop, server->source, m);
server->wait_clients++;
}
}