mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-cli: allow param names in enum-params

Browse source 
So that "pw-cli e <object.id> Props" works
This commit is contained in:
Wim Taymans 2021-04-09 15:55:04 +02:00
parent 87706c7442
commit 6217f20c04
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/tools/pw-cli.c
View file

@ -1456,12 +1456,27 @@ static bool do_export_node(struct data *data, const char *cmd, char *args, char
return false; return false;
} }
static const struct spa_type_info *find_type_info(const struct spa_type_info *info, const char *name)
{
while (info && info->name) {
if (strcmp(info->name, name) == 0)
return info;
if (strcmp(spa_debug_type_short_name(info->name), name) == 0)
return info;
if (info->type != 0 && info->type == (uint32_t)atoi(name))
return info;
info++;
}
return NULL;
}
static bool do_enum_params(struct data *data, const char *cmd, char *args, char **error) static bool do_enum_params(struct data *data, const char *cmd, char *args, char **error)
{ {
struct remote_data *rd = data->current; struct remote_data *rd = data->current;
char *a[2]; char *a[2];
int n; int n;
uint32_t id, param_id; uint32_t id, param_id;
const struct spa_type_info *ti;
struct global *global; struct global *global;
n = pw_split_ip(args, WHITESPACE, 2, a); n = pw_split_ip(args, WHITESPACE, 2, a);
@ -1471,7 +1486,12 @@ static bool do_enum_params(struct data *data, const char *cmd, char *args, char
} }
id = atoi(a[0]); id = atoi(a[0]);
param_id = atoi(a[1]); ti = find_type_info(spa_type_param, a[1]);
if (ti == NULL) {
*error = spa_aprintf("%s: unknown param type: %s", cmd, a[1]);
return false;
}
param_id = ti->type;
global = pw_map_lookup(&rd->globals, id); global = pw_map_lookup(&rd->globals, id);
if (global == NULL) { if (global == NULL) {
@ -1503,20 +1523,6 @@ static bool do_enum_params(struct data *data, const char *cmd, char *args, char
return true; return true;
} }
static const struct spa_type_info *find_type_info(const struct spa_type_info *info, const char *name)
{
while (info && info->name) {
if (strcmp(info->name, name) == 0)
return info;
if (strcmp(spa_debug_type_short_name(info->name), name) == 0)
return info;
if (info->type != 0 && info->type == (uint32_t)atoi(name))
return info;
info++;
}
return NULL;
}
static int json_to_pod(struct spa_pod_builder *b, uint32_t id, static int json_to_pod(struct spa_pod_builder *b, uint32_t id,
const struct spa_type_info *info, struct spa_json *iter, const char *value, int len) const struct spa_type_info *info, struct spa_json *iter, const char *value, int len)
{ {