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

pulse-server: split device info validation into dedicated function

Browse source
This commit is contained in:
Thomas Weißschuh 2023-01-16 04:23:39 +00:00 • committed by Wim Taymans
parent bb1f595b53
commit 6f84bef2b0
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -3746,6 +3746,13 @@ static int fill_sink_info_proplist(struct message *m, const struct spa_dict *sin
return 0; return 0;
} }
static bool validate_device_info(struct device_info *dev_info)
{
return sample_spec_valid(&dev_info->ss) &&
channel_map_valid(&dev_info->map) &&
volume_valid(&dev_info->volume_info.volume);
}
static int fill_sink_info(struct client *client, struct message *m, static int fill_sink_info(struct client *client, struct message *m,
struct pw_manager_object *o) struct pw_manager_object *o)
{ {
@ -3796,9 +3803,7 @@ static int fill_sink_info(struct client *client, struct message *m,
collect_device_info(o, card, &dev_info, false, &impl->defs); collect_device_info(o, card, &dev_info, false, &impl->defs);
if (!sample_spec_valid(&dev_info.ss) || if (!validate_device_info(&dev_info)) {
!channel_map_valid(&dev_info.map) ||
!volume_valid(&dev_info.volume_info.volume)) {
pw_log_warn("%d: sink not ready: sample:%d map:%d volume:%d", pw_log_warn("%d: sink not ready: sample:%d map:%d volume:%d",
o->id, sample_spec_valid(&dev_info.ss), o->id, sample_spec_valid(&dev_info.ss),
channel_map_valid(&dev_info.map), channel_map_valid(&dev_info.map),
@ -4011,9 +4016,7 @@ static int fill_source_info(struct client *client, struct message *m,
collect_device_info(o, card, &dev_info, is_monitor, &impl->defs); collect_device_info(o, card, &dev_info, is_monitor, &impl->defs);
if (!sample_spec_valid(&dev_info.ss) || if (!validate_device_info(&dev_info)) {
!channel_map_valid(&dev_info.map) ||
!volume_valid(&dev_info.volume_info.volume)) {
pw_log_warn("%d: source not ready: sample:%d map:%d volume:%d", pw_log_warn("%d: source not ready: sample:%d map:%d volume:%d",
o->id, sample_spec_valid(&dev_info.ss), o->id, sample_spec_valid(&dev_info.ss),
channel_map_valid(&dev_info.map), channel_map_valid(&dev_info.map),
@ -4154,9 +4157,7 @@ static int fill_sink_input_info(struct client *client, struct message *m,
collect_device_info(o, NULL, &dev_info, false, &impl->defs); collect_device_info(o, NULL, &dev_info, false, &impl->defs);
if (!sample_spec_valid(&dev_info.ss) || if (!validate_device_info(&dev_info))
!channel_map_valid(&dev_info.map) ||
!volume_valid(&dev_info.volume_info.volume))
return -ENOENT; return -ENOENT;
peer_index = get_temporary_move_target(client, o); peer_index = get_temporary_move_target(client, o);
@ -4237,9 +4238,7 @@ static int fill_source_output_info(struct client *client, struct message *m,
collect_device_info(o, NULL, &dev_info, false, &impl->defs); collect_device_info(o, NULL, &dev_info, false, &impl->defs);
if (!sample_spec_valid(&dev_info.ss) || if (!validate_device_info(&dev_info))
!channel_map_valid(&dev_info.map) ||
!volume_valid(&dev_info.volume_info.volume))
return -ENOENT; return -ENOENT;
peer_index = get_temporary_move_target(client, o); peer_index = get_temporary_move_target(client, o);