diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-04-13 18:20:05 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-04-13 18:20:05 +0000 |
| commit | c25c549c420fe450b259b2bdcb2e200bf5862147 (patch) | |
| tree | 4d720e10a39155f34bd9408cf164d826d4aba6b3 /src/modules | |
| parent | 9854cfc146b555bc0b28008e638d221fe2eecf43 (diff) | |
fix latency calculations of module-combine
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@704 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/module-combine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index 28e85427..80153900 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) { |