mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove spalib

Browse source
This commit is contained in:
Wim Taymans 2018-08-14 12:33:53 +02:00
parent f532fd8681
commit a6ad8f747f
69 changed files with 612 additions and 1250 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/tools/meson.build
View file

@ -1,11 +1,9 @@
executable('spa-inspect', 'spa-inspect.c',
include_directories : [spa_inc, spa_libinc],
include_directories : [spa_inc],
dependencies : [dl_lib],
link_with : spalib,
install : true)
executable('spa-monitor', 'spa-monitor.c',
include_directories : [spa_inc, spa_libinc],
include_directories : [spa_inc],
dependencies : [dl_lib],
link_with : spalib,
install : true)

21
spa/tools/spa-inspect.c
View file

@ -31,8 +31,8 @@
#include <spa/pod/parser.h>
#include <spa/param/param.h>
#include <spa/param/format.h>
#include <lib/debug.h>
#include <spa/debug/dict.h>
#include <spa/debug/format.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
@ -80,8 +80,6 @@ inspect_node_params(struct data *data, struct spa_node *node)
printf("enumerating: %s:\n", spa_type_map_get_type(data->map, id));
for (idx2 = 0;;) {
uint32_t flags = 0;
spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_enum_params(node,
id, &idx2,
@ -90,7 +88,7 @@ inspect_node_params(struct data *data, struct spa_node *node)
error(0, -res, "enum_params %d", id);
break;
}
spa_debug_pod(param, flags);
spa_debug_pod(0, data->map, param);
}
}
}
@ -123,8 +121,6 @@ inspect_port_params(struct data *data, struct spa_node *node,
printf("enumerating: %s:\n", spa_type_map_get_type(data->map, id));
for (idx2 = 0;;) {
uint32_t flags = 0;
spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params(node,
direction, port_id,
@ -136,8 +132,9 @@ inspect_port_params(struct data *data, struct spa_node *node,
}
if (spa_pod_is_object_type(param, data->type.format))
flags |= SPA_DEBUG_FLAG_FORMAT;
spa_debug_pod(param, flags);
spa_debug_format(0, data->map, param);
else
spa_debug_pod(0, data->map, param);
}
}
}
@ -150,7 +147,7 @@ static void inspect_node(struct data *data, struct spa_node *node)
printf("node info:\n");
if (node->info)
spa_debug_dict(node->info);
spa_debug_dict(2, node->info);
else
printf(" none\n");
@ -193,7 +190,7 @@ static void inspect_factory(struct data *data, const struct spa_handle_factory *
printf("factory name:\t\t'%s'\n", factory->name);
printf("factory info:\n");
if (factory->info)
spa_debug_dict(factory->info);
spa_debug_dict(2, factory->info);
else
printf(" none\n");
@ -283,8 +280,6 @@ int main(int argc, char *argv[])
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);
spa_debug_set_type_map(data.map);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;

10
spa/tools/spa-monitor.c
View file

@ -28,9 +28,11 @@
#include <spa/support/log-impl.h>
#include <spa/support/type-map-impl.h>
#include <spa/support/loop.h>
#include <spa/support/plugin.h>
#include <spa/monitor/monitor.h>
#include <lib/debug.h>
#include <spa/debug/dict.h>
#include <spa/debug/pod.h>
static SPA_TYPE_MAP_IMPL(default_map, 4096);
static SPA_LOG_IMPL(default_log);
@ -60,7 +62,7 @@ struct data {
static void inspect_item(struct data *data, struct spa_pod *item)
{
spa_debug_pod(item, 0);
spa_debug_pod(0, data->map, item);
}
static void on_monitor_event(void *_data, struct spa_event *event)
@ -110,7 +112,7 @@ static void handle_monitor(struct data *data, struct spa_monitor *monitor)
uint32_t index;
if (monitor->info)
spa_debug_dict(monitor->info);
spa_debug_dict(0, monitor->info);
for (index = 0;;) {
struct spa_pod *item;
@ -174,8 +176,6 @@ int main(int argc, char *argv[])
data.main_loop.update_source = do_update_source;
data.main_loop.remove_source = do_remove_source;
spa_debug_set_type_map(data.map);
data.support[0].type = SPA_TYPE__TypeMap;
data.support[0].data = data.map;
data.support[1].type = SPA_TYPE__Log;