summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-06-27 00:28:17 +0200
committerLennart Poettering <lennart@poettering.net>2008-06-27 00:28:17 +0200
commit06ab488f7338d41b749320f60b86f22dcb848514 (patch)
tree9a2b64d490bbf6bb37e2f40d96fa5b693c13fb83
parent9f0afb391a0748b2e1e78d5b19f1af48a249a674 (diff)
cork/uncork before we ask for the rewrite, to make sure the rewrite actually gets trhough
-rw-r--r--src/pulsecore/sink-input.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 4086b85b..dedcf952 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1004,6 +1004,7 @@ int pa_sink_input_move_to(pa_sink_input *i, pa_sink *dest) {
/* Called from IO thread context */
void pa_sink_input_set_state_within_thread(pa_sink_input *i, pa_sink_input_state_t state) {
+ pa_bool_t corking, uncorking;
pa_sink_input_assert_ref(i);
if (state == i->thread_info.state)
@@ -1013,23 +1014,30 @@ void pa_sink_input_set_state_within_thread(pa_sink_input *i, pa_sink_input_state
!(i->thread_info.state == PA_SINK_INPUT_DRAINED || i->thread_info.state != PA_SINK_INPUT_RUNNING))
pa_atomic_store(&i->thread_info.drained, 1);
- if (state == PA_SINK_INPUT_CORKED && i->thread_info.state != PA_SINK_INPUT_CORKED) {
+ corking = state == PA_SINK_INPUT_CORKED && i->thread_info.state == PA_SINK_INPUT_RUNNING;
+ uncorking = i->thread_info.state == PA_SINK_INPUT_CORKED && state == PA_SINK_INPUT_RUNNING;
+
+ if (i->state_change)
+ i->state_change(i, state);
+
+ i->thread_info.state = state;
+
+ if (corking) {
+
+ pa_log_debug("Requesting rewind due to corking");
/* This will tell the implementing sink input driver to rewind
* so that the unplayed already mixed data is not lost */
pa_sink_input_request_rewind(i, 0, TRUE, TRUE);
- } else if (i->thread_info.state == PA_SINK_INPUT_CORKED && state != PA_SINK_INPUT_CORKED) {
+ } else if (uncorking) {
+
+ pa_log_debug("Requesting rewind due to uncorking");
/* OK, we're being uncorked. Make sure we're not rewound when
* the hw buffer is remixed and request a remix. */
pa_sink_input_request_rewind(i, 0, FALSE, TRUE);
}
-
- if (i->state_change)
- i->state_change(i, state);
-
- i->thread_info.state = state;
}
/* Called from thread context, except when it is not. */