diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-01-09 16:57:42 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-01-09 16:57:42 +0000 |
| commit | 160d886c0d8f783765d06662d87c01a3603e1c4c (patch) | |
| tree | 8d100b82ec24258f71c08a84f73f06cc23a39e26 | |
| parent | 8258146625050d242b9bc3dc5f175985feb5e2bd (diff) | |
Merge with trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@430 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | polyp/polyplib-stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/polyp/polyplib-stream.c b/polyp/polyplib-stream.c index c7c40c0d..7058b546 100644 --- a/polyp/polyplib-stream.c +++ b/polyp/polyplib-stream.c @@ -413,7 +413,7 @@ static void stream_get_latency_info_callback(struct pa_pdispatch *pd, uint32_t c } else { pa_gettimeofday(&now); - if (pa_timeval_cmp(&local, &remote) < 0 && pa_timeval_cmp(&remote, &now)) { + if (pa_timeval_cmp(&local, &remote) <= 0 && pa_timeval_cmp(&remote, &now) <= 0) { /* local and remote seem to have synchronized clocks */ if (o->stream->direction == PA_STREAM_PLAYBACK) |