mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink-input: Avoid fake rewind in corked state

Browse source 
sink_input_request_rewind() does nothing if we are in the corked state.
Thus do not set the new state untill we have issued the rewind request.
This commit is contained in:
Wang Xingchao 2011-08-13 13:55:06 +02:00 • committed by Colin Guthrie
parent 50b420aebd
commit 2f55da5baa
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pulsecore/sink-input.c
View file

@ -1752,8 +1752,6 @@ void pa_sink_input_set_state_within_thread(pa_sink_input *i, pa_sink_input_state
if (i->state_change) if (i->state_change)
i->state_change(i, state); i->state_change(i, state);
i->thread_info.state = state;
if (corking) { if (corking) {
pa_log_debug("Requesting rewind due to corking"); pa_log_debug("Requesting rewind due to corking");
@ -1762,17 +1760,25 @@ void pa_sink_input_set_state_within_thread(pa_sink_input *i, pa_sink_input_state
* so that the unplayed already mixed data is not lost */ * so that the unplayed already mixed data is not lost */
pa_sink_input_request_rewind(i, 0, TRUE, TRUE, FALSE); pa_sink_input_request_rewind(i, 0, TRUE, TRUE, FALSE);
/* Set the corked state *after* requesting rewind */
i->thread_info.state = state;
} else if (uncorking) { } else if (uncorking) {
pa_log_debug("Requesting rewind due to uncorking");
i->thread_info.underrun_for = (uint64_t) -1; i->thread_info.underrun_for = (uint64_t) -1;
i->thread_info.playing_for = 0; i->thread_info.playing_for = 0;
pa_log_debug("Requesting rewind due to uncorking"); /* Set the uncorked state *before* requesting rewind */
i->thread_info.state = state;
/* OK, we're being uncorked. Make sure we're not rewound when /* OK, we're being uncorked. Make sure we're not rewound when
* the hw buffer is remixed and request a remix. */ * the hw buffer is remixed and request a remix. */
pa_sink_input_request_rewind(i, 0, FALSE, TRUE, TRUE); pa_sink_input_request_rewind(i, 0, FALSE, TRUE, TRUE);
} } else
/* We may not be corking or uncorking, but we still need to set the state. */
i->thread_info.state = state;
} }
/* Called from thread context, except when it is not. */ /* Called from thread context, except when it is not. */