summaryrefslogtreecommitdiffstats
path: root/src/modules/module-remap-sink.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-06-26 19:43:45 +0200
committerLennart Poettering <lennart@poettering.net>2008-06-26 19:43:45 +0200
commit9f0afb391a0748b2e1e78d5b19f1af48a249a674 (patch)
tree65edabd90e9624cd96adf0108befb52325bb91c9 /src/modules/module-remap-sink.c
parentd08cac0f8545d493812f83111166458c6248dc45 (diff)
always forward rewind requests to the sink, and don't abort on nbytes=0
Diffstat (limited to 'src/modules/module-remap-sink.c')
-rw-r--r--src/modules/module-remap-sink.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/modules/module-remap-sink.c b/src/modules/module-remap-sink.c
index c87b1ece..bd86f4d6 100644
--- a/src/modules/module-remap-sink.c
+++ b/src/modules/module-remap-sink.c
@@ -152,24 +152,21 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
/* Called from I/O thread context */
static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) {
+ size_t amount = 0;
struct userdata *u;
pa_sink_input_assert_ref(i);
pa_assert_se(u = i->userdata);
- pa_assert(nbytes > 0);
if (!u->sink || !PA_SINK_IS_OPENED(u->sink->thread_info.state))
return;
if (u->sink->thread_info.rewind_nbytes > 0) {
- size_t amount;
-
amount = PA_MIN(u->sink->thread_info.rewind_nbytes, nbytes);
u->sink->thread_info.rewind_nbytes = 0;
-
- if (amount > 0)
- pa_sink_process_rewind(u->sink, amount);
}
+
+ pa_sink_process_rewind(u->sink, amount);
}
/* Called from I/O thread context */