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

pulse: call operation_done at end of callback

Browse source
This commit is contained in:
Wim Taymans 2020-09-09 13:48:01 +02:00
parent a477e39de2
commit af64666716
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pipewire-pulseaudio/src/context.c
View file

@ -1715,9 +1715,9 @@ static void on_notify(pa_operation *o, void *userdata)
{ {
struct notify_data *d = userdata; struct notify_data *d = userdata;
pa_context *c = o->context; pa_context *c = o->context;
pa_operation_done(o);
if (d->cb) if (d->cb)
d->cb(c, d->userdata); d->cb(c, d->userdata);
pa_operation_done(o);
} }
SPA_EXPORT SPA_EXPORT
@ -1787,8 +1787,8 @@ static void do_default_node(pa_operation *o, void *userdata)
pa_context_set_error(c, error); pa_context_set_error(c, error);
if (d->cb) if (d->cb)
d->cb(c, error != 0 ? 0 : 1, d->userdata); d->cb(c, error != 0 ? 0 : 1, d->userdata);
pa_operation_done(o);
pa_xfree(d->name); pa_xfree(d->name);
pa_operation_done(o);
} }
SPA_EXPORT SPA_EXPORT

8
pipewire-pulseaudio/src/introspect.c
View file

@ -736,8 +736,8 @@ static void do_device_route(pa_operation *o, void *userdata)
pa_context_set_error(c, error); pa_context_set_error(c, error);
if (d->cb) if (d->cb)
d->cb(c, error != 0 ? 0 : 1, d->userdata); d->cb(c, error != 0 ? 0 : 1, d->userdata);
pa_operation_done(o);
pa_xfree(d->port); pa_xfree(d->port);
pa_operation_done(o);
} }
SPA_EXPORT SPA_EXPORT
@ -1437,11 +1437,11 @@ static void on_load_module(pa_operation *o, void *userdata)
pa_context_set_error(c, d->error); pa_context_set_error(c, d->error);
if (d->cb) if (d->cb)
d->cb(c, d->idx, d->userdata); d->cb(c, d->idx, d->userdata);
pa_operation_done(o);
if (d->props) if (d->props)
pw_properties_free(d->props); pw_properties_free(d->props);
if (d->proxy) if (d->proxy)
spa_hook_remove(&d->listener); spa_hook_remove(&d->listener);
pa_operation_done(o);
} }
static void module_proxy_removed(void *data) static void module_proxy_removed(void *data)
@ -1945,8 +1945,8 @@ done:
pa_context_set_error(c, error); pa_context_set_error(c, error);
if (d->success_cb) if (d->success_cb)
d->success_cb(c, error ? 0 : 1, d->userdata); d->success_cb(c, error ? 0 : 1, d->userdata);
pa_operation_done(o);
free(d->profile); free(d->profile);
pa_operation_done(o);
} }
SPA_EXPORT SPA_EXPORT
@ -2237,8 +2237,8 @@ done:
pa_context_set_error(c, error); pa_context_set_error(c, error);
if (d->cb) if (d->cb)
d->cb(c, error != 0 ? 0 : 1, d->userdata); d->cb(c, error != 0 ? 0 : 1, d->userdata);
pa_operation_done(o);
pa_xfree(d->target_name); pa_xfree(d->target_name);
pa_operation_done(o);
} }
SPA_EXPORT SPA_EXPORT

1
pipewire-pulseaudio/src/stream.c
View file

@ -1027,6 +1027,7 @@ static void on_disconnected(pa_operation *o, void *userdata)
pa_stream *s = o->stream; pa_stream *s = o->stream;
pw_log_debug("stream %p", s); pw_log_debug("stream %p", s);
pa_stream_set_state(s, PA_STREAM_TERMINATED); pa_stream_set_state(s, PA_STREAM_TERMINATED);
pa_operation_done(o);
} }
SPA_EXPORT SPA_EXPORT