From 7e5e015cbe40d955d6f7baa6e3ce406a1256ee05 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 17 May 2008 09:14:47 +0000 Subject: link latency of monitor source to sink git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2457 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pulsecore/sink.c | 34 ++++++++++++++++++++++++++++++++++ src/pulsecore/sink.h | 2 ++ 2 files changed, 36 insertions(+) (limited to 'src') diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 31c3cfc8..c099497c 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -248,6 +248,9 @@ pa_sink* pa_sink_new( return NULL; } + s->monitor_source->min_latency = s->min_latency; + s->monitor_source->max_latency = s->max_latency; + s->monitor_source->monitor_of = s; pa_source_set_max_rewind(s->monitor_source, s->thread_info.max_rewind); @@ -1228,6 +1231,7 @@ pa_usec_t pa_sink_get_requested_latency_within_thread(pa_sink *s) { pa_usec_t result = (pa_usec_t) -1; pa_sink_input *i; void *state = NULL; + pa_usec_t monitor_latency; pa_sink_assert_ref(s); @@ -1240,6 +1244,12 @@ pa_usec_t pa_sink_get_requested_latency_within_thread(pa_sink *s) { (result == (pa_usec_t) -1 || result > i->thread_info.requested_sink_latency)) result = i->thread_info.requested_sink_latency; + monitor_latency = pa_source_get_requested_latency_within_thread(s->monitor_source); + + if (monitor_latency != (pa_usec_t) -1 && + (result == (pa_usec_t) -1 || result > monitor_latency)) + result = monitor_latency; + if (result != (pa_usec_t) -1) { if (s->max_latency > 0 && result > s->max_latency) result = s->max_latency; @@ -1300,3 +1310,27 @@ void pa_sink_invalidate_requested_latency(pa_sink *s) { if (s->update_requested_latency) s->update_requested_latency(s); } + +void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_latency) { + pa_sink_assert_ref(s); + + /* min_latency == 0: no limit + * min_latency == (size_t) -1: default limit + * min_latency anything else: specified limit + * + * Similar for max_latency */ + + if (min_latency == (pa_usec_t) -1) + min_latency = DEFAULT_MIN_LATENCY; + + if (max_latency == (pa_usec_t) -1) + max_latency = min_latency; + + pa_assert(!min_latency || !max_latency || + min_latency <= max_latency); + + s->min_latency = min_latency; + s->max_latency = max_latency; + + pa_source_set_latency_range(s->monitor_source, min_latency, max_latency); +} diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index f297c8f1..546bbe13 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -209,6 +209,8 @@ void pa_sink_set_description(pa_sink *s, const char *description); void pa_sink_set_asyncmsgq(pa_sink *s, pa_asyncmsgq *q); void pa_sink_set_rtpoll(pa_sink *s, pa_rtpoll *p); +void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_latency); + void pa_sink_detach(pa_sink *s); void pa_sink_attach(pa_sink *s); -- cgit