Merge commit 'coling/master'

This commit is contained in:
Lennart Poettering 2009-01-28 00:25:50 +01:00
commit 611154caca

View file

@ -208,7 +208,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
w = pa_bytes_to_usec((u->offset - u->encoding_overhead + (u->encoded_memchunk.length / u->encoding_ratio)), &u->sink->sample_spec); w = pa_bytes_to_usec((u->offset - u->encoding_overhead + (u->encoded_memchunk.length / u->encoding_ratio)), &u->sink->sample_spec);
*((pa_usec_t*) data) = w > r ? w - r : 0; *((pa_usec_t*) data) = w > r ? w - r : 0;
break; return 0;
} }
case SINK_MESSAGE_PASS_SOCKET: { case SINK_MESSAGE_PASS_SOCKET: {