summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-05-15 23:16:49 +0000
committerLennart Poettering <lennart@poettering.net>2008-05-15 23:16:49 +0000
commite3c5a777504f0c19027806c1639c596469259324 (patch)
tree1a4a592463e08d87c27154d6c0643277320b8b28
parent99a451655a2db4c6c7a70f7e54b68991a046ff16 (diff)
fix moving of record streams
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2440 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/source-output.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 3940d768..5c36937a 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -635,13 +635,25 @@ int pa_source_output_move_to(pa_source_output *o, pa_source *dest) {
if (o->thread_info.resampler)
pa_resampler_free(o->thread_info.resampler);
o->thread_info.resampler = new_resampler;
- }
- pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o->source), PA_SOURCE_MESSAGE_ADD_OUTPUT, o, 0, NULL);
+ pa_memblockq_free(o->thread_info.delay_memblockq);
+
+ o->thread_info.delay_memblockq = pa_memblockq_new(
+ 0,
+ MEMBLOCKQ_MAXLENGTH,
+ 0,
+ pa_frame_size(&o->source->sample_spec),
+ 0,
+ 1,
+ 0,
+ &o->source->silence);
+ }
pa_source_update_status(origin);
pa_source_update_status(dest);
+ pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o->source), PA_SOURCE_MESSAGE_ADD_OUTPUT, o, 0, NULL);
+
if (o->moved)
o->moved(o);