summaryrefslogtreecommitdiffstats
path: root/src/polypcore/protocol-native.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-03-02 14:22:25 +0000
committerLennart Poettering <lennart@poettering.net>2006-03-02 14:22:25 +0000
commit8cf9b972e2bdb888b25506c312a7b44ba0af198c (patch)
tree6486b370dab8643058eba2f661615933bdc0dd1c /src/polypcore/protocol-native.c
parent76f56ab462e27b69ce5b1094da512de0259b5568 (diff)
protocol changes for new latency API (partial!)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@616 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/polypcore/protocol-native.c')
-rw-r--r--src/polypcore/protocol-native.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 20ba5131..76761b73 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -1031,13 +1031,11 @@ static void command_get_playback_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_
pa_tagstruct *reply;
struct playback_stream *s;
struct timeval tv, now;
- uint64_t counter;
uint32_t idx;
assert(c && t);
if (pa_tagstruct_getu32(t, &idx) < 0 ||
pa_tagstruct_get_timeval(t, &tv) < 0 ||
- pa_tagstruct_getu64(t, &counter) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
@@ -1057,7 +1055,8 @@ static void command_get_playback_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_
pa_tagstruct_put_timeval(reply, &tv);
pa_gettimeofday(&now);
pa_tagstruct_put_timeval(reply, &now);
- pa_tagstruct_putu64(reply, counter);
+ pa_tagstruct_puts64(reply, pa_memblockq_get_write_index(s->memblockq));
+ pa_tagstruct_puts64(reply, pa_memblockq_get_read_index(s->memblockq));
pa_pstream_send_tagstruct(c->pstream, reply);
}
@@ -1066,13 +1065,11 @@ static void command_get_record_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UN
pa_tagstruct *reply;
struct record_stream *s;
struct timeval tv, now;
- uint64_t counter;
uint32_t idx;
assert(c && t);
if (pa_tagstruct_getu32(t, &idx) < 0 ||
pa_tagstruct_get_timeval(t, &tv) < 0 ||
- pa_tagstruct_getu64(t, &counter) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
@@ -1091,7 +1088,8 @@ static void command_get_record_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UN
pa_tagstruct_put_timeval(reply, &tv);
pa_gettimeofday(&now);
pa_tagstruct_put_timeval(reply, &now);
- pa_tagstruct_putu64(reply, counter);
+ pa_tagstruct_puts64(reply, pa_memblockq_get_write_index(s->memblockq));
+ pa_tagstruct_puts64(reply, pa_memblockq_get_read_index(s->memblockq));
pa_pstream_send_tagstruct(c->pstream, reply);
}