From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 13 Apr 2006 18:20:05 +0000 (+0000)
Subject: fix latency calculations of module-combine
X-Git-Tag: 1.0_branch~3814
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c25c549c420fe450b259b2bdcb2e200bf5862147;p=profile%2Fivi%2Fpulseaudio.git

fix latency calculations of module-combine


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@704 fefdeb5f-60dc-0310-8127-8f9354f1896f
---

diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 28e8542..8015390 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -200,7 +200,9 @@ static pa_usec_t sink_get_latency_cb(pa_sink *s) {
     struct userdata *u = s->userdata;
     assert(s && u && u->sink && u->master);
 
-    return pa_sink_input_get_latency(u->master->sink_input);
+    return
+        pa_sink_input_get_latency(u->master->sink_input) +
+        pa_sink_get_latency(u->master->sink_input->sink);
 }
 
 static struct output *output_new(struct userdata *u, pa_sink *sink, int resample_method) {