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

Rename "available group" to "availability group"

Browse source 
"Availability group" is more clear about what the field is about.
Credits to Arun Raghavan for coming up with the better name.
This commit is contained in:
Tanu Kaskinen 2020-06-17 08:40:16 +03:00
parent 1b44b44c75
commit af42b3eb6f
11 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/alsa/alsa-mixer.c
View file

@ -758,7 +758,7 @@ void pa_alsa_path_free(pa_alsa_path *p) {
}
pa_proplist_free(p->proplist);
pa_xfree(p->available_group);
pa_xfree(p->availability_group);
pa_xfree(p->name);
pa_xfree(p->description);
pa_xfree(p->description_key);
@ -4276,7 +4276,7 @@ fail:
}
/* the logic is simple: if we see the jack in multiple paths */
/* assign all those jacks to one available_group */
/* assign all those jacks to one availability_group */
static void mapping_group_available(pa_hashmap *paths)
{
void *state, *state2;
@ -4300,7 +4300,7 @@ static void mapping_group_available(pa_hashmap *paths)
if (pa_streq(j->name, j2->name)) {
j->state_plugged = PA_AVAILABLE_UNKNOWN;
j2->state_plugged = PA_AVAILABLE_UNKNOWN;
found = p2->available_group;
found = p2->availability_group;
break;
}
}
@ -4311,9 +4311,9 @@ static void mapping_group_available(pa_hashmap *paths)
if (!has_control)
continue;
if (!found) {
p->available_group = pa_sprintf_malloc("Legacy %d", num);
p->availability_group = pa_sprintf_malloc("Legacy %d", num);
} else {
p->available_group = pa_xstrdup(found);
p->availability_group = pa_xstrdup(found);
}
if (!found)
num++;
@ -5173,7 +5173,7 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports, /* card ports */
pa_device_port_new_data_set_description(&port_data, description);
pa_device_port_new_data_set_direction(&port_data, path->direction == PA_ALSA_DIRECTION_OUTPUT ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT);
pa_device_port_new_data_set_type(&port_data, path->device_port_type);
pa_device_port_new_data_set_available_group(&port_data, path->available_group);
pa_device_port_new_data_set_availability_group(&port_data, path->availability_group);
p = pa_device_port_new(core, &port_data, sizeof(pa_alsa_port_data));
pa_device_port_new_data_done(&port_data);

2
src/modules/alsa/alsa-mixer.h
View file

@ -211,7 +211,7 @@ struct pa_alsa_path {
char *name;
char *description_key;
char *description;
char *available_group;
char *availability_group;
pa_device_port_type_t device_port_type;
unsigned priority;
bool autodetect_eld_device;

2
src/modules/alsa/alsa-ucm.c
View file

@ -1065,7 +1065,7 @@ static void ucm_add_port_combination(
pa_device_port_new_data_set_type(&port_data, type);
pa_device_port_new_data_set_direction(&port_data, is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT);
if (jack)
pa_device_port_new_data_set_available_group(&port_data, jack->name);
pa_device_port_new_data_set_availability_group(&port_data, jack->name);
port = pa_device_port_new(core, &port_data, sizeof(pa_alsa_ucm_port_data));
pa_device_port_new_data_done(&port_data);

2
src/modules/module-tunnel.c
View file

@ -1040,7 +1040,7 @@ static int read_ports(struct userdata *u, pa_tagstruct *t) {
return -PA_ERR_PROTOCOL;
}
if (u->version >= 34 &&
(pa_tagstruct_gets(t, &s) < 0 || /* available_group */
(pa_tagstruct_gets(t, &s) < 0 || /* availability group */
pa_tagstruct_getu32(t, &priority) < 0)) { /* device port type */
pa_log("Parse failure");
return -PA_ERR_PROTOCOL;