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

idxset: Use pa_free_cb_t instead of pa_free2_cb_t

Browse source 
There were no users for the userdata pointer.
This commit is contained in:
Tanu Kaskinen 2013-02-12 21:36:55 +02:00
parent 43e7868008
commit 061878b5a4
27 changed files with 81 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-combine-sink.c
View file

@ -550,6 +550,7 @@ static void sink_input_kill_cb(pa_sink_input *i) {
pa_assert_se(o = i->userdata);
pa_module_unload_request(o->userdata->module, TRUE);
pa_idxset_remove_by_data(o->userdata->outputs, o, NULL);
output_free(o);
}
@ -1107,6 +1108,7 @@ static pa_hook_result_t sink_unlink_hook_cb(pa_core *c, pa_sink *s, struct userd
if (!u->automatic)
u->unlinked_slaves = pa_strlist_prepend(u->unlinked_slaves, s->name);
pa_idxset_remove_by_data(u->outputs, o, NULL);
output_free(o);
return PA_HOOK_OK;
@ -1368,7 +1370,6 @@ fail:
void pa__done(pa_module*m) {
struct userdata *u;
struct output *o;
pa_assert(m);
@ -1386,12 +1387,8 @@ void pa__done(pa_module*m) {
if (u->sink_state_changed_slot)
pa_hook_slot_free(u->sink_state_changed_slot);
if (u->outputs) {
while ((o = pa_idxset_first(u->outputs, NULL)))
output_free(o);
pa_idxset_free(u->outputs, NULL, NULL);
}
if (u->outputs)
pa_idxset_free(u->outputs, (pa_free_cb_t) output_free);
if (u->sink)
pa_sink_unlink(u->sink);