mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink, source: rename set_state() to set_state_in_main_thread()

Browse source 
There will be a new callback named set_state_in_io_thread(). It seems
like a good idea to have a similar name for the main thread variant.
This commit is contained in:
Tanu Kaskinen 2018-03-13 19:40:36 +02:00
parent f6fe411b32
commit 0fad369ceb
17 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulsecore/source.c
View file

@ -141,7 +141,7 @@ void pa_source_new_data_done(pa_source_new_data *data) {
static void reset_callbacks(pa_source *s) {
pa_assert(s);
s->set_state = NULL;
s->set_state_in_main_thread = NULL;
s->get_volume = NULL;
s->set_volume = NULL;
s->write_volume = NULL;
@ -381,9 +381,9 @@ static int source_set_state(pa_source *s, pa_source_state_t state, pa_suspend_ca
* cause, or it might just add unnecessary complexity, given that the
* current approach of not setting any suspend cause works well enough. */
if (s->set_state) {
ret = s->set_state(s, state, suspend_cause);
/* set_state() is allowed to fail only when resuming. */
if (s->set_state_in_main_thread) {
ret = s->set_state_in_main_thread(s, state, suspend_cause);
/* set_state_in_main_thread() is allowed to fail only when resuming. */
pa_assert(ret >= 0 || resuming);
}
@ -392,8 +392,8 @@ static int source_set_state(pa_source *s, pa_source_state_t state, pa_suspend_ca
/* SET_STATE is allowed to fail only when resuming. */
pa_assert(resuming);
if (s->set_state)
s->set_state(s, PA_SOURCE_SUSPENDED, 0);
if (s->set_state_in_main_thread)
s->set_state_in_main_thread(s, PA_SOURCE_SUSPENDED, 0);
}
if (suspend_cause_changed) {