From d02511115c30246339a4cd8185665894ab105979 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 17 Jun 2014 14:13:21 +0300 Subject: [PATCH] combine-sink: Rearrange block_usec initialization block_usec should be determined by the sink max latency, not the other way around. This change doesn't cause any change in behaviour, but makes the code more logical. Further updates to block_usec are already done correctly, so this is the only place that needs modification. --- src/modules/module-combine-sink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c index 369262066..48f562197 100644 --- a/src/modules/module-combine-sink.c +++ b/src/modules/module-combine-sink.c @@ -1355,13 +1355,13 @@ int pa__init(pa_module*m) { pa_sink_set_rtpoll(u->sink, u->rtpoll); pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); - u->block_usec = BLOCK_USEC; - nbytes = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec); + nbytes = pa_usec_to_bytes(BLOCK_USEC, &u->sink->sample_spec); pa_sink_set_max_request(u->sink, nbytes); - pa_sink_set_latency_range(u->sink, 0, u->block_usec); + pa_sink_set_latency_range(u->sink, 0, BLOCK_USEC); /* pulse clamps the range, get the real values */ u->default_min_latency = u->sink->thread_info.min_latency; u->default_max_latency = u->sink->thread_info.max_latency; + u->block_usec = u->sink->thread_info.max_latency; if (!u->automatic) {