debug: allow custom type root

This commit is contained in:
Wim Taymans 2018-08-30 12:01:52 +02:00
parent 05d3502c84
commit 7cdb980b1a
32 changed files with 102 additions and 83 deletions

View file

@ -91,7 +91,7 @@ struct data {
static void inspect_item(struct data *data, struct spa_pod *item)
{
spa_debug_pod(0, spa_debug_types, item);
spa_debug_pod(0, NULL, item);
}
static void monitor_event(void *_data, struct spa_event *event)

View file

@ -208,7 +208,7 @@ static void update_props(struct data *data)
#endif
#if 0
spa_pod_builder_push_sequence(&b, 0);
spa_pod_builder_event_header(&b, 0, SPA_CONTROL_properties);
spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties);
spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Props, 0);
spa_pod_builder_push_prop(&b, SPA_PROP_frequency, 0);
spa_pod_builder_double(&b, ((sin(data->freq_accum) + 1.0) * 200.0) + 440.0);
@ -221,7 +221,7 @@ static void update_props(struct data *data)
#endif
#if 0
spa_pod_builder_push_sequence(&b, 0);
spa_pod_builder_event_header(&b, 0, SPA_CONTROL_properties);
spa_pod_builder_control_header(&b, 0, SPA_CONTROL_Properties);
spa_pod_builder_object(&b,
SPA_TYPE_OBJECT_Props, 0,
":", SPA_PROP_frequency, "d", ((sin(data->freq_accum) + 1.0) * 200.0) + 440.0,
@ -229,7 +229,7 @@ static void update_props(struct data *data)
pod = spa_pod_builder_pop(&b);
#endif
spa_debug_pod(0, spa_types, pod);
spa_debug_pod(0, NULL, pod);
data->freq_accum += M_PI_M2 / 880.0;
if (data->freq_accum >= M_PI_M2)
@ -314,7 +314,7 @@ static int make_nodes(struct data *data, const char *device)
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", MIN_LATENCY);
spa_debug_pod(0, spa_debug_types, props);
spa_debug_pod(0, NULL, props);
if ((res = spa_node_set_param(data->sink, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
@ -386,7 +386,7 @@ static int negotiate_formats(struct data *data)
.rate = 44100,
.channels = 2 ));
spa_debug_pod(0, spa_debug_types, filter);
spa_debug_pod(0, NULL, filter);
spa_log_debug(&default_log.log, "enum_params");
if ((res = spa_node_port_enum_params(data->sink,
@ -395,7 +395,7 @@ static int negotiate_formats(struct data *data)
filter, &format, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, spa_debug_types, format);
spa_debug_pod(0, NULL, format);
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,

View file

@ -267,7 +267,7 @@ static int negotiate_buffers(struct data *data)
NULL, &param, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, spa_debug_types, param);
spa_debug_pod(0, NULL, param);
init_buffer(data, data->in_buffers, data->in_buffer, 1, BUFFER_SIZE, 1);
if ((res =
@ -284,7 +284,7 @@ static int negotiate_buffers(struct data *data)
NULL, &param, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, spa_debug_types, param);
spa_debug_pod(0, NULL, param);
init_buffer(data, data->out_buffers, data->out_buffer, 1, BUFFER_SIZE, 2);
if ((res =

View file

@ -320,7 +320,7 @@ static int negotiate_link_buffers(struct data *data, struct link *link)
}
spa_pod_fixate(param);
spa_debug_pod(0, spa_debug_types, param);
spa_debug_pod(0, NULL, param);
if (link->in_info)
in_alloc = SPA_FLAG_CHECK(link->in_info->flags, SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS);

View file

@ -261,7 +261,7 @@ static int make_nodes(struct data *data, const char *device)
":", SPA_PROP_device, "s", device ? device : "hw:0",
":", SPA_PROP_minLatency, "i", MIN_LATENCY);
spa_debug_pod(0, spa_debug_types, props);
spa_debug_pod(0, NULL, props);
if ((res = spa_node_set_param(data->sink, SPA_PARAM_Props, 0, props)) < 0)
printf("got set_props error %d\n", res);
@ -353,7 +353,7 @@ static int negotiate_formats(struct data *data)
.rate = 44100,
.channels = 2 ));
spa_debug_pod(0, spa_debug_types, filter);
spa_debug_pod(0, NULL, filter);
spa_log_debug(&default_log.log, "enum_params");
if ((res = spa_node_port_enum_params(data->sink,
@ -362,7 +362,7 @@ static int negotiate_formats(struct data *data)
filter, &format, &b)) <= 0)
return -EBADF;
spa_debug_pod(0, spa_debug_types, format);
spa_debug_pod(0, NULL, format);
spa_log_debug(&default_log.log, "sink set_param");
if ((res = spa_node_port_set_param(data->sink,

View file

@ -231,7 +231,7 @@ static void do_static_struct(void)
}
};
spa_debug_pod(0, spa_debug_types, &test_format.fmt.pod);
spa_debug_pod(0, NULL, &test_format.fmt.pod);
spa_debug_format(0, NULL, &test_format.fmt.pod);
{
@ -294,7 +294,7 @@ int main(int argc, char *argv[])
fmt = spa_pod_builder_pop(&b);
spa_debug_pod(0, spa_debug_types, &fmt->pod);
spa_debug_pod(0, NULL, &fmt->pod);
spa_pod_builder_init(&b, buffer, sizeof(buffer));
@ -312,7 +312,7 @@ int main(int argc, char *argv[])
2, &SPA_FRACTION(0,1),
&SPA_FRACTION(INT32_MAX,1));
spa_debug_pod(0, spa_debug_types, &fmt->pod);
spa_debug_pod(0, NULL, &fmt->pod);
spa_debug_format(0, NULL, &fmt->pod);
spa_pod_builder_init(&b, buffer, sizeof(buffer));
@ -342,7 +342,7 @@ int main(int argc, char *argv[])
&SPA_FRACTION(INT32_MAX,1),
"}", NULL);
spa_debug_pod(0, spa_debug_types, &fmt->pod);
spa_debug_pod(0, NULL, &fmt->pod);
spa_debug_format(0, NULL, &fmt->pod);
do_static_struct();

View file

@ -81,11 +81,11 @@ int main(int argc, char *argv[])
spa_pod_builder_pop(&b);
obj = spa_pod_builder_pop(&b);
spa_debug_pod(0, spa_debug_types, obj);
spa_debug_pod(0, NULL, obj);
struct spa_pod_prop *p = spa_pod_find_prop(obj, 4);
printf("%d %d\n", p->body.key, p->body.flags);
spa_debug_pod(0, spa_debug_types, &p->body.value);
spa_debug_pod(0, NULL, &p->body.value);
obj = spa_pod_builder_deref(&b, ref);