diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-03-25 00:25:17 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-03-25 00:25:17 +0100 |
| commit | 9151107cb9a1fe0620d3ddb53ac6982a75e1d010 (patch) | |
| tree | 54f60790878296149fdc4369bd2013f45ce0c8de /src/pulsecore/sink.c | |
| parent | a7246bd635ab5eb9f708937383d7c3ebf5c1345c (diff) | |
get rid of 'default' min/max latencies, simplify things by just having absolute boundaries
Diffstat (limited to 'src/pulsecore/sink.c')
| -rw-r--r-- | src/pulsecore/sink.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index a3bf03a6..1fec0189 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -49,7 +49,6 @@ #define MAX_MIX_CHANNELS 32 #define MIX_BUFFER_LENGTH (PA_PAGE_SIZE) #define ABSOLUTE_MIN_LATENCY (500) -#define DEFAULT_MIN_LATENCY (4*PA_USEC_PER_MSEC) #define ABSOLUTE_MAX_LATENCY (10*PA_USEC_PER_SEC) static PA_DEFINE_CHECK_TYPE(pa_sink, pa_msgobject); @@ -232,8 +231,8 @@ pa_sink* pa_sink_new( s->thread_info.max_request = 0; s->thread_info.requested_latency_valid = FALSE; s->thread_info.requested_latency = 0; - s->thread_info.min_latency = DEFAULT_MIN_LATENCY; - s->thread_info.max_latency = DEFAULT_MIN_LATENCY; + s->thread_info.min_latency = ABSOLUTE_MIN_LATENCY; + s->thread_info.max_latency = ABSOLUTE_MAX_LATENCY; pa_assert_se(pa_idxset_put(core->sinks, s, &s->index) >= 0); @@ -1857,21 +1856,15 @@ void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_ 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 (min_latency < ABSOLUTE_MIN_LATENCY) min_latency = ABSOLUTE_MIN_LATENCY; - if (max_latency == (pa_usec_t) -1) - max_latency = min_latency; - - if (max_latency > ABSOLUTE_MAX_LATENCY || max_latency <= 0) + if (max_latency <= 0 || + max_latency > ABSOLUTE_MAX_LATENCY) max_latency = ABSOLUTE_MAX_LATENCY; pa_assert(min_latency <= max_latency); |