diff --git a/src/pipewire/impl-device.c b/src/pipewire/impl-device.c index e4bdc91bf..6035e7643 100644 --- a/src/pipewire/impl-device.c +++ b/src/pipewire/impl-device.c @@ -249,7 +249,7 @@ int pw_impl_device_for_each_param(struct pw_impl_device *device, if (max == 0) max = UINT32_MAX; - pw_log_debug(NAME" %p: params %s %u %u", device, + pw_log_debug(NAME" %p: params id:%d (%s) index:%u max:%u", device, param_id, spa_debug_type_find_name(spa_type_param, param_id), index, max); @@ -332,8 +332,8 @@ static int device_subscribe_params(void *object, uint32_t *ids, uint32_t n_ids) for (i = 0; i < n_ids; i++) { data->subscribe_ids[i] = ids[i]; - pw_log_debug(NAME" %p: resource %p subscribe param %s", - data->device, resource, + pw_log_debug(NAME" %p: resource %p subscribe param id:%d (%s)", + data->device, resource, ids[i], spa_debug_type_find_name(spa_type_param, ids[i])); device_enum_params(data, 1, ids[i], 0, UINT32_MAX, NULL); } diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c index e997ad7ec..f1cb31953 100644 --- a/src/pipewire/impl-node.c +++ b/src/pipewire/impl-node.c @@ -373,8 +373,8 @@ static int node_enum_params(void *object, int seq, uint32_t id, struct pw_impl_client *client = resource->client; int res; - pw_log_debug(NAME" %p: resource %p enum params %d %s %u %u", - node, resource, seq, + pw_log_debug(NAME" %p: resource %p enum params seq:%d id:%d (%s) index:%u num:%u", + node, resource, seq, id, spa_debug_type_find_name(spa_type_param, id), index, num); if ((res = pw_impl_node_for_each_param(node, seq, id, index, num, @@ -383,7 +383,7 @@ static int node_enum_params(void *object, int seq, uint32_t id, resource, resource->id, res, spa_strerror(res)); pw_core_resource_errorf(client->core_resource, resource->id, seq, res, - "enum params %s failed", + "enum params id:%d (%s) failed", id, spa_debug_type_find_name(spa_type_param, id)); } return 0; @@ -400,8 +400,8 @@ static int node_subscribe_params(void *object, uint32_t *ids, uint32_t n_ids) for (i = 0; i < n_ids; i++) { data->subscribe_ids[i] = ids[i]; - pw_log_debug(NAME" %p: resource %p subscribe param %s", - data->node, resource, + pw_log_debug(NAME" %p: resource %p subscribe param id:%d (%s)", + data->node, resource, ids[i], spa_debug_type_find_name(spa_type_param, ids[i])); node_enum_params(data, 1, ids[i], 0, UINT32_MAX, NULL); } @@ -433,8 +433,8 @@ static int node_set_param(void *object, uint32_t id, uint32_t flags, .result = result_node_sync, }; - pw_log_debug(NAME" %p: resource %p set param %s %08x", node, resource, - spa_debug_type_find_name(spa_type_param, id), flags); + pw_log_debug(NAME" %p: resource %p set param id:%d (%s) %08x", node, resource, + id, spa_debug_type_find_name(spa_type_param, id), flags); res = spa_node_set_param(node->node, id, flags, param); @@ -1614,7 +1614,7 @@ int pw_impl_node_for_each_param(struct pw_impl_node *node, if (max == 0) max = UINT32_MAX; - pw_log_debug(NAME" %p: params %s %u %u", node, + pw_log_debug(NAME" %p: params id:%d (%s) index:%u max:%u", node, param_id, spa_debug_type_find_name(spa_type_param, param_id), index, max); @@ -1632,7 +1632,7 @@ SPA_EXPORT int pw_impl_node_set_param(struct pw_impl_node *node, uint32_t id, uint32_t flags, const struct spa_pod *param) { - pw_log_debug(NAME" %p: set_param %s flags:%08x param:%p", node, + pw_log_debug(NAME" %p: set_param id:%d (%s) flags:%08x param:%p", node, id, spa_debug_type_find_name(spa_type_param, id), flags, param); return spa_node_set_param(node->node, id, flags, param); } diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c index ca66a6761..d6375f31b 100644 --- a/src/pipewire/impl-port.c +++ b/src/pipewire/impl-port.c @@ -641,7 +641,7 @@ static int check_param_io(void *data, int seq, uint32_t id, SPA_PARAM_IO_size, SPA_POD_Int(&psize)) < 0) return 0; - pw_log_debug(NAME" %p: got io %s", port, + pw_log_debug(NAME" %p: got io id:%d (%s)", port, pid, spa_debug_type_find_name(spa_type_io, pid)); switch (pid) { @@ -678,8 +678,8 @@ static int port_enum_params(void *object, int seq, uint32_t id, uint32_t index, struct pw_impl_port *port = data->port; int res; - pw_log_debug(NAME" %p: resource %p enum params %d %s %u %u", port, - resource, seq, spa_debug_type_find_name(spa_type_param, id), + pw_log_debug(NAME" %p: resource %p enum params seq:%d id:%d (%s) index:%u num:%u", port, + resource, seq, id, spa_debug_type_find_name(spa_type_param, id), index, num); if ((res = pw_impl_port_for_each_param(port, seq, id, index, num, filter, @@ -700,8 +700,9 @@ static int port_subscribe_params(void *object, uint32_t *ids, uint32_t n_ids) for (i = 0; i < n_ids; i++) { data->subscribe_ids[i] = ids[i]; - pw_log_debug(NAME" %p: resource %p subscribe param %s", data->port, - resource, spa_debug_type_find_name(spa_type_param, ids[i])); + pw_log_debug(NAME" %p: resource %p subscribe param id:%d (%s)", data->port, + resource, ids[i], + spa_debug_type_find_name(spa_type_param, ids[i])); port_enum_params(data, 1, ids[i], 0, UINT32_MAX, NULL); } return 0; @@ -1043,7 +1044,7 @@ int pw_impl_port_for_each_param(struct pw_impl_port *port, if (max == 0) max = UINT32_MAX; - pw_log_debug(NAME" %p: params %s %u %u", port, + pw_log_debug(NAME" %p: params id:%d (%s) index:%u max:%u", port, param_id, spa_debug_type_find_name(spa_type_param, param_id), index, max); @@ -1140,9 +1141,10 @@ int pw_impl_port_set_param(struct pw_impl_port *port, uint32_t id, uint32_t flag port->direction, port->port_id, id, flags, param); - pw_log_debug(NAME" %p: %d set param on node %d:%d %s: %d (%s)", port, port->state, - port->direction, port->port_id, - spa_debug_type_find_name(spa_type_param, id), res, spa_strerror(res)); + pw_log_debug(NAME" %p: %d set param on node %d:%d id:%d (%s): %d (%s)", port, port->state, + port->direction, port->port_id, id, + spa_debug_type_find_name(spa_type_param, id), + res, spa_strerror(res)); /* set the parameters on all ports of the mixer node if possible */ if (res >= 0) {