summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/play-memblockq.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
commit0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2 (patch)
tree42c290cd1f1c05c687d8134e40b63244d4fba4e9 /src/pulsecore/play-memblockq.c
parent0e096632c53b746b9f4b4c0249d9e5a18c1c543d (diff)
parent8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/modules/module-stream-restore.c
Diffstat (limited to 'src/pulsecore/play-memblockq.c')
-rw-r--r--src/pulsecore/play-memblockq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/play-memblockq.c b/src/pulsecore/play-memblockq.c
index b0d76993..f528c496 100644
--- a/src/pulsecore/play-memblockq.c
+++ b/src/pulsecore/play-memblockq.c
@@ -199,7 +199,7 @@ pa_sink_input* pa_memblockq_sink_input_new(
pa_sink_input_new_data_set_volume(&data, volume);
pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p);
- pa_sink_input_new(&u->sink_input, sink->core, &data, 0);
+ pa_sink_input_new(&u->sink_input, sink->core, &data);
pa_sink_input_new_data_done(&data);
if (!u->sink_input)