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

stream: use the stream drain method to drain

Browse source
This commit is contained in:
Wim Taymans 2019-08-16 15:23:05 +02:00
parent 23a875e2bf
commit f9fce3cb30
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/stream.c
View file

@ -493,15 +493,6 @@ static void stream_process(void *data)
update_timing_info(s); update_timing_info(s);
if (s->drain && s->queued == 0) {
pa_operation *o = s->drain;
pa_operation_ref(o);
if (o->callback)
o->callback(o, o->userdata);
pa_operation_unref(o);
s->drain = NULL;
}
while (dequeue_buffer(s) == 0); while (dequeue_buffer(s) == 0);
if (s->dequeued_size <= 0) if (s->dequeued_size <= 0)
@ -517,6 +508,20 @@ static void stream_process(void *data)
} }
} }
static void stream_drained(void *data)
{
pa_stream *s = data;
if (s->drain) {
pa_operation *o = s->drain;
pa_operation_ref(o);
if (o->callback)
o->callback(o, o->userdata);
pa_operation_unref(o);
s->drain = NULL;
}
}
static const struct pw_stream_events stream_events = static const struct pw_stream_events stream_events =
{ {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
@ -526,6 +531,7 @@ static const struct pw_stream_events stream_events =
.add_buffer = stream_add_buffer, .add_buffer = stream_add_buffer,
.remove_buffer = stream_remove_buffer, .remove_buffer = stream_remove_buffer,
.process = stream_process, .process = stream_process,
.drained = stream_drained,
}; };
static pa_stream* stream_new(pa_context *c, const char *name, static pa_stream* stream_new(pa_context *c, const char *name,
@ -1320,6 +1326,7 @@ pa_operation* pa_stream_drain(pa_stream *s, pa_stream_success_cb_t cb, void *use
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction == PA_STREAM_PLAYBACK, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction == PA_STREAM_PLAYBACK, PA_ERR_BADSTATE);
pw_log_debug("stream %p", s); pw_log_debug("stream %p", s);
pw_stream_flush(s->stream, true);
o = pa_operation_new(s->context, s, on_success, sizeof(struct success_ack)); o = pa_operation_new(s->context, s, on_success, sizeof(struct success_ack));
d = o->userdata; d = o->userdata;
d->cb = cb; d->cb = cb;