diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-09-13 13:26:44 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-09-13 13:26:44 +0000 |
commit | fbefe67d52eb89a429505c653d1ea4ce73d4f4e7 (patch) | |
tree | 662d7e8eb69b53a632353a742c7e5a4c9d70682d /polyp/module-alsa-sink.c | |
parent | 12315982066ee1044840b598624920f8028c7924 (diff) |
correct latency calculation
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@197 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/module-alsa-sink.c')
-rw-r--r-- | polyp/module-alsa-sink.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/polyp/module-alsa-sink.c b/polyp/module-alsa-sink.c index 95bb81f1..55e719c9 100644 --- a/polyp/module-alsa-sink.c +++ b/polyp/module-alsa-sink.c @@ -144,6 +144,7 @@ static void io_callback(struct pa_mainloop_api*a, struct pa_io_event *e, int fd, } static pa_usec_t sink_get_latency_cb(struct pa_sink *s) { + pa_usec_t r = 0; struct userdata *u = s->userdata; snd_pcm_sframes_t frames; assert(s && u && u->sink); @@ -157,7 +158,12 @@ static pa_usec_t sink_get_latency_cb(struct pa_sink *s) { if (frames < 0) frames = 0; - return pa_bytes_to_usec(frames * u->frame_size, &s->sample_spec); + r += pa_bytes_to_usec(frames * u->frame_size, &s->sample_spec); + + if (u->memchunk.memblock) + r += pa_bytes_to_usec(u->memchunk.length, &s->sample_spec); + + return r; } int pa__init(struct pa_core *c, struct pa_module*m) { |