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 28e85427986c58fd82adf61fe4edaf2c08ffb2ec..801539004c7f2aeba9072360eb447e0ee4592a6c 100644 (file)
--- 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) {