From 62e7bc17c41c5542779a3c395a9d47d2bd306de2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 20 Apr 2008 20:16:55 +0000 Subject: Big pile of dependant changes: * Change pa_memblockq to carry silence memchunk instead of memblock and adapt all users * Add new call pa_sink_input_get_silence() to get the suitable silence block for a sink input * Implement monitoring sources properly by adding a delay queue to even out rewinds * Remove pa_{sink|source}_ping() becaused unnecessary these days and not used * Fix naming of various rewind related functions. Downstream is now _request_rewind(), upstream is _process_rewind() * Fix volume adjustments for a single stream in pa_sink_render() * Properly handle prebuf-style buffer underruns in pa_sink_input * Don't allow rewinding to more than the last underrun * Rework default buffering metrics selection for native protocol * New functions pa_memblockq_prebuf_active(), pa_memblockq_silence() * add option "mixer_reset=" to module-alsa-sink * Other cleanups git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2283 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/modules/module-remap-sink.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/modules/module-remap-sink.c') diff --git a/src/modules/module-remap-sink.c b/src/modules/module-remap-sink.c index 2dc4f2a1..3f70ee1d 100644 --- a/src/modules/module-remap-sink.c +++ b/src/modules/module-remap-sink.c @@ -112,7 +112,7 @@ static void sink_request_rewind(pa_sink *s) { pa_sink_assert_ref(s); pa_assert_se(u = s->userdata); - pa_sink_input_request_rewrite(u->sink_input, s->thread_info.rewind_nbytes); + pa_sink_input_request_rewind(u->sink_input, s->thread_info.rewind_nbytes, FALSE); } /* Called from I/O thread context */ @@ -166,8 +166,7 @@ static void sink_input_rewind_cb(pa_sink_input *i, size_t nbytes) { pa_assert_se(u = i->userdata); pa_assert(nbytes > 0); - u->sink->thread_info.rewind_nbytes = nbytes; - pa_sink_process_rewind(u->sink); + pa_sink_process_rewind(u->sink, nbytes); } /* Called from I/O thread context */ -- cgit