mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-link: use proper enum for object types

Browse source 
Using an enum provides better debugging experience and
indicates the purpose better than a bare `uint32_t`.
This commit is contained in:
Barnabás Pőcze 2024-01-04 15:55:34 +01:00 • committed by Wim Taymans
parent 5218afc7e8
commit 6160615726
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tools/pw-link.c
View file

@ -16,15 +16,18 @@
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
#include <pipewire/filter.h> #include <pipewire/filter.h>
enum object_type {
OBJECT_ANY,
OBJECT_NODE,
OBJECT_PORT,
OBJECT_LINK,
};
struct object { struct object {
struct spa_list link; struct spa_list link;
uint32_t id; uint32_t id;
#define OBJECT_ANY 0 enum object_type type;
#define OBJECT_NODE 1
#define OBJECT_PORT 2
#define OBJECT_LINK 3
uint32_t type;
struct pw_properties *props; struct pw_properties *props;
uint32_t extra[2]; uint32_t extra[2];
}; };
@ -159,7 +162,7 @@ static void core_sync(struct data *data)
data->sync = pw_core_sync(data->core, PW_ID_CORE, data->sync); data->sync = pw_core_sync(data->core, PW_ID_CORE, data->sync);
} }
static struct object *find_object(struct data *data, uint32_t type, uint32_t id) static struct object *find_object(struct data *data, enum object_type type, uint32_t id)
{ {
struct object *o; struct object *o;
spa_list_for_each(o, &data->objects, link) spa_list_for_each(o, &data->objects, link)
@ -630,7 +633,8 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
const struct spa_dict *props) const struct spa_dict *props)
{ {
struct data *d = data; struct data *d = data;
uint32_t t, extra[2]; enum object_type t;
uint32_t extra[2];
struct object *obj; struct object *obj;
const char *str; const char *str;
@ -679,6 +683,10 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
if (d->monitoring) { if (d->monitoring) {
d->prefix = "+ "; d->prefix = "+ ";
switch (obj->type) { switch (obj->type) {
case OBJECT_ANY:
spa_assert_not_reached();
case OBJECT_NODE:
break;
case OBJECT_PORT: case OBJECT_PORT:
do_monitor_port(d, obj); do_monitor_port(d, obj);
break; break;
@ -700,6 +708,10 @@ static void registry_event_global_remove(void *data, uint32_t id)
if (d->monitoring) { if (d->monitoring) {
d->prefix = "- "; d->prefix = "- ";
switch (obj->type) { switch (obj->type) {
case OBJECT_ANY:
spa_assert_not_reached();
case OBJECT_NODE:
break;
case OBJECT_PORT: case OBJECT_PORT:
do_monitor_port(d, obj); do_monitor_port(d, obj);
break; break;