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

device-port: Remove pa_device_port_hashmap_free()

Browse source
This commit is contained in:
Tanu Kaskinen 2013-02-12 21:36:54 +02:00
parent 8872c238ba
commit 43e7868008
6 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -2432,7 +2432,7 @@ static pa_hook_result_t uuid_added_cb(pa_bluetooth_discovery *y, const struct pa
pa_card_add_ports(u->card, new_ports);
pa_device_port_hashmap_free(new_ports);
pa_hashmap_free(new_ports, (pa_free_cb_t) pa_device_port_unref);
return PA_HOOK_OK;
}

4
src/pulsecore/card.c
View file

@ -129,7 +129,7 @@ void pa_card_new_data_done(pa_card_new_data *data) {
pa_hashmap_free(data->profiles, (pa_free_cb_t) pa_card_profile_free);
if (data->ports)
pa_device_port_hashmap_free(data->ports);
pa_hashmap_free(data->ports, (pa_free_cb_t) pa_device_port_unref);
pa_xfree(data->name);
pa_xfree(data->active_profile);
@ -237,7 +237,7 @@ void pa_card_free(pa_card *c) {
pa_assert(pa_idxset_isempty(c->sources));
pa_idxset_free(c->sources, NULL, NULL);
pa_device_port_hashmap_free(c->ports);
pa_hashmap_free(c->ports, (pa_free_cb_t) pa_device_port_unref);
if (c->profiles)
pa_hashmap_free(c->profiles, (pa_free_cb_t) pa_card_profile_free);

6
src/pulsecore/device-port.c
View file

@ -89,12 +89,6 @@ pa_device_port *pa_device_port_new(pa_core *c, const char *name, const char *des
return p;
}
void pa_device_port_hashmap_free(pa_hashmap *h) {
pa_assert(h);
pa_hashmap_free(h, (pa_free_cb_t) pa_device_port_unref);
}
void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset) {
uint32_t state;
pa_core *core;

2
src/pulsecore/device-port.h
View file

@ -65,8 +65,6 @@ PA_DECLARE_PUBLIC_CLASS(pa_device_port);
pa_device_port *pa_device_port_new(pa_core *c, const char *name, const char *description, size_t extra);
void pa_device_port_hashmap_free(pa_hashmap *h);
/* The port's available status has changed */
void pa_device_port_set_available(pa_device_port *p, pa_port_available_t available);

4
src/pulsecore/sink.c
View file

@ -142,7 +142,7 @@ void pa_sink_new_data_done(pa_sink_new_data *data) {
pa_proplist_free(data->proplist);
if (data->ports)
pa_device_port_hashmap_free(data->ports);
pa_hashmap_free(data->ports, (pa_free_cb_t) pa_device_port_unref);
pa_xfree(data->name);
pa_xfree(data->active_port);
@ -743,7 +743,7 @@ static void sink_free(pa_object *o) {
pa_proplist_free(s->proplist);
if (s->ports)
pa_device_port_hashmap_free(s->ports);
pa_hashmap_free(s->ports, (pa_free_cb_t) pa_device_port_unref);
pa_xfree(s);
}

4
src/pulsecore/source.c
View file

@ -133,7 +133,7 @@ void pa_source_new_data_done(pa_source_new_data *data) {
pa_proplist_free(data->proplist);
if (data->ports)
pa_device_port_hashmap_free(data->ports);
pa_hashmap_free(data->ports, (pa_free_cb_t) pa_device_port_unref);
pa_xfree(data->name);
pa_xfree(data->active_port);
@ -672,7 +672,7 @@ static void source_free(pa_object *o) {
pa_proplist_free(s->proplist);
if (s->ports)
pa_device_port_hashmap_free(s->ports);
pa_hashmap_free(s->ports, (pa_free_cb_t) pa_device_port_unref);
pa_xfree(s);
}