projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9854cfc
)
fix latency calculations of module-combine
author
Lennart Poettering
<lennart@poettering.net>
Thu, 13 Apr 2006 18:20:05 +0000
(18:20 +0000)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 13 Apr 2006 18:20:05 +0000
(18:20 +0000)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@704
fefdeb5f
-60dc-0310-8127-
8f9354f1896f
src/modules/module-combine.c
patch
|
blob
|
history
diff --git
a/src/modules/module-combine.c
b/src/modules/module-combine.c
index
28e8542
..
8015390
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) {