[polypaudio-commits] r704 - /trunk/src/modules/module-combine.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Apr 13 20:20:05 2006
New Revision: 704

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=704&root=polypaudio&view=rev
Log:
fix latency calculations of module-combine

Modified:
    trunk/src/modules/module-combine.c

Modified: trunk/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-combine.c?rev=704&root=polypaudio&r1=703&r2=704&view=diff
==============================================================================
--- trunk/src/modules/module-combine.c (original)
+++ trunk/src/modules/module-combine.c Thu Apr 13 20:20:05 2006
@@ -200,7 +200,9 @@
     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) {