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

alsa: Use pa_device_port->impl_free() for freeing port data

Browse source 
This allows us to clean up ucm port data associated with a port during
port clean up, instead of having to track this separately using a
dynarray.
This commit is contained in:
Arun Raghavan 2016-05-03 18:22:09 +05:30 • committed by Arun Raghavan
parent 9e10c1caa3
commit b793f68f2e
3 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4754,6 +4754,7 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports, /* card ports */
pa_proplist_update(p->proplist, PA_UPDATE_REPLACE, path->proplist); pa_proplist_update(p->proplist, PA_UPDATE_REPLACE, path->proplist);
data = PA_DEVICE_PORT_DATA(p); data = PA_DEVICE_PORT_DATA(p);
/* Ownership of the path and setting is not transferred to the port data, so we don't deal with freeing them */
data->path = path; data->path = path;
data->setting = setting; data->setting = setting;
path->port = p; path->port = p;

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

@ -90,9 +90,9 @@ struct ucm_port {
pa_dynarray *devices; /* pa_alsa_ucm_device */ pa_dynarray *devices; /* pa_alsa_ucm_device */
}; };
static struct ucm_port *ucm_port_new(pa_alsa_ucm_config *ucm, pa_device_port *core_port, pa_alsa_ucm_device **devices, static void ucm_port_init(struct ucm_port *port, pa_alsa_ucm_config *ucm, pa_device_port *core_port,
unsigned n_devices); pa_alsa_ucm_device **devices, unsigned n_devices);
static void ucm_port_free(struct ucm_port *port); static void ucm_port_free(pa_device_port *port);
static void ucm_port_update_available(struct ucm_port *port); static void ucm_port_update_available(struct ucm_port *port);
static struct ucm_items item[] = { static struct ucm_items item[] = {
@ -576,8 +576,6 @@ int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index) {
const char **verb_list; const char **verb_list;
int num_verbs, i, err = 0; int num_verbs, i, err = 0;
ucm->ports = pa_dynarray_new((pa_free_cb_t) ucm_port_free);
/* is UCM available for this card ? */ /* is UCM available for this card ? */
err = snd_card_get_name(card_index, &card_name); err = snd_card_get_name(card_index, &card_name);
if (err < 0) { if (err < 0) {
@ -769,12 +767,12 @@ static void ucm_add_port_combination(
pa_device_port_new_data_set_description(&port_data, desc); pa_device_port_new_data_set_description(&port_data, desc);
pa_device_port_new_data_set_direction(&port_data, is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT); pa_device_port_new_data_set_direction(&port_data, is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT);
port = pa_device_port_new(core, &port_data, sizeof(struct ucm_port *)); port = pa_device_port_new(core, &port_data, sizeof(struct ucm_port));
port->impl_free = ucm_port_free;
pa_device_port_new_data_done(&port_data); pa_device_port_new_data_done(&port_data);
ucm_port = ucm_port_new(context->ucm, port, pdevices, num); ucm_port = PA_DEVICE_PORT_DATA(port);
pa_dynarray_append(context->ucm->ports, ucm_port); ucm_port_init(ucm_port, context->ucm, port, pdevices, num);
*((struct ucm_port **) PA_DEVICE_PORT_DATA(port)) = ucm_port;
pa_hashmap_put(ports, port->name, port); pa_hashmap_put(ports, port->name, port);
pa_log_debug("Add port %s: %s", port->name, port->description); pa_log_debug("Add port %s: %s", port->name, port->description);
@ -1681,9 +1679,6 @@ void pa_alsa_ucm_free(pa_alsa_ucm_config *ucm) {
pa_alsa_ucm_verb *vi, *vn; pa_alsa_ucm_verb *vi, *vn;
pa_alsa_jack *ji, *jn; pa_alsa_jack *ji, *jn;
if (ucm->ports)
pa_dynarray_free(ucm->ports);
PA_LLIST_FOREACH_SAFE(vi, vn, ucm->verbs) { PA_LLIST_FOREACH_SAFE(vi, vn, ucm->verbs) {
PA_LLIST_REMOVE(pa_alsa_ucm_verb, ucm->verbs, vi); PA_LLIST_REMOVE(pa_alsa_ucm_verb, ucm->verbs, vi);
free_verb(vi); free_verb(vi);
@ -1838,16 +1833,14 @@ void pa_alsa_ucm_device_update_available(pa_alsa_ucm_device *device) {
device_set_available(device, available); device_set_available(device, available);
} }
static struct ucm_port *ucm_port_new(pa_alsa_ucm_config *ucm, pa_device_port *core_port, pa_alsa_ucm_device **devices, static void ucm_port_init(struct ucm_port *port, pa_alsa_ucm_config *ucm, pa_device_port *core_port,
unsigned n_devices) { pa_alsa_ucm_device **devices, unsigned n_devices) {
struct ucm_port *port;
unsigned i; unsigned i;
pa_assert(ucm); pa_assert(ucm);
pa_assert(core_port); pa_assert(core_port);
pa_assert(devices); pa_assert(devices);
port = pa_xnew0(struct ucm_port, 1);
port->ucm = ucm; port->ucm = ucm;
port->core_port = core_port; port->core_port = core_port;
port->devices = pa_dynarray_new(NULL); port->devices = pa_dynarray_new(NULL);
@ -1858,17 +1851,17 @@ static struct ucm_port *ucm_port_new(pa_alsa_ucm_config *ucm, pa_device_port *co
} }
ucm_port_update_available(port); ucm_port_update_available(port);
return port;
} }
static void ucm_port_free(struct ucm_port *port) { static void ucm_port_free(pa_device_port *port) {
struct ucm_port *ucm_port;
pa_assert(port); pa_assert(port);
if (port->devices) ucm_port = PA_DEVICE_PORT_DATA(port);
pa_dynarray_free(port->devices);
pa_xfree(port); if (ucm_port->devices)
pa_dynarray_free(ucm_port->devices);
} }
static void ucm_port_update_available(struct ucm_port *port) { static void ucm_port_update_available(struct ucm_port *port) {

1
src/modules/alsa/alsa-ucm.h
View file

@ -196,7 +196,6 @@ struct pa_alsa_ucm_config {
PA_LLIST_HEAD(pa_alsa_ucm_verb, verbs); PA_LLIST_HEAD(pa_alsa_ucm_verb, verbs);
PA_LLIST_HEAD(pa_alsa_jack, jacks); PA_LLIST_HEAD(pa_alsa_jack, jacks);
pa_dynarray *ports; /* struct ucm_port */
}; };
struct pa_alsa_ucm_mapping_context { struct pa_alsa_ucm_mapping_context {