diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
| commit | 88d5749f6ae8d391963a12a6221f006de2947e50 (patch) | |
| tree | f1de05b054b1ee8b272804a03b621a1dde1d8416 /src/pulsecore/protocol-native.c | |
| parent | 0225ef68f2876bebd14977882db313fd7f3f6d64 (diff) | |
| parent | 3d6278bc31aa7053f1228b3d874ba36f50a8c2d5 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Conflicts:
src/daemon/main.c
Diffstat (limited to 'src/pulsecore/protocol-native.c')
| -rw-r--r-- | src/pulsecore/protocol-native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 96184bd2..9a37c565 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -2550,7 +2550,7 @@ static void command_get_playback_latency(pa_pdispatch *pd, uint32_t command, uin reply = reply_new(tag); pa_tagstruct_put_usec(reply, s->current_sink_latency + - pa_bytes_to_usec(s->render_memblockq_length, &s->sink_input->sample_spec)); + pa_bytes_to_usec(s->render_memblockq_length, &s->sink_input->sink->sample_spec)); pa_tagstruct_put_usec(reply, 0); pa_tagstruct_put_boolean(reply, s->playing_for > 0 && |