summaryrefslogtreecommitdiffstats
path: root/src/protocol-native.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-07-03 00:19:17 +0000
committerLennart Poettering <lennart@poettering.net>2004-07-03 00:19:17 +0000
commit741aa44ffc8afd63cd29e5ae46f778dc68340df8 (patch)
tree2838bb11c8db75119cc3224ee7c93fb195e468d5 /src/protocol-native.c
parent13b35a2489e7e1d6341effe6e25b8cb8a0a94a02 (diff)
add resampling
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@45 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/protocol-native.c')
-rw-r--r--src/protocol-native.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/protocol-native.c b/src/protocol-native.c
index 9af438a9..425f4ba4 100644
--- a/src/protocol-native.c
+++ b/src/protocol-native.c
@@ -89,7 +89,7 @@ static struct playback_stream* playback_stream_new(struct connection *c, struct
s->connection = c;
s->qlength = qlen;
- s->sink_input = sink_input_new(sink, ss, name);
+ s->sink_input = sink_input_new(sink, name, ss);
assert(s->sink_input);
s->sink_input->peek = sink_input_peek_cb;
s->sink_input->drop = sink_input_drop_cb;
@@ -323,7 +323,7 @@ static int memblock_callback(struct pstream *p, uint32_t channel, int32_t delta,
else
stream->requested_bytes -= chunk->length;
- memblockq_push(stream->memblockq, chunk, delta);
+ memblockq_push_align(stream->memblockq, chunk, delta);
assert(stream->sink_input);
sink_notify(stream->sink_input->sink);