Merge with trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@430 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-01-09 16:57:42 +00:00
parent 8258146625
commit 160d886c0d

View file

@ -413,7 +413,7 @@ static void stream_get_latency_info_callback(struct pa_pdispatch *pd, uint32_t c
} else { } else {
pa_gettimeofday(&now); 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 */ /* local and remote seem to have synchronized clocks */
if (o->stream->direction == PA_STREAM_PLAYBACK) if (o->stream->direction == PA_STREAM_PLAYBACK)