diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2018-06-26 16:25:57 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2018-07-02 18:54:03 +0300 |
| commit | b4a36453da7647ece7797dcca1628f7878aab870 (patch) | |
| tree | e4690319f11c7d592d50c03ac49afa01fddbe161 /src/modules/module-virtual-sink.c | |
| parent | 64ba239f65b162b278e145376e26b94ad290dac5 (diff) | |
| download | pulseaudio-b4a36453da7647ece7797dcca1628f7878aab870.tar.gz | |
sink-input, source-output: remove the state getters
pa_sink_input_get_state() and pa_source_output_get_state() just return
the state variable. We can as well access the state variable directly.
There are no behaviour changes, except that some filter sources accessed
the main thread's state variable from their push() callbacks. I fixed
them so that they use the thread_info.state variable instead.
Diffstat (limited to 'src/modules/module-virtual-sink.c')
| -rw-r--r-- | src/modules/module-virtual-sink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c index 3a818225d..2f4445c26 100644 --- a/src/modules/module-virtual-sink.c +++ b/src/modules/module-virtual-sink.c @@ -119,7 +119,7 @@ static int sink_set_state_in_main_thread_cb(pa_sink *s, pa_sink_state_t state, p pa_assert_se(u = s->userdata); if (!PA_SINK_IS_LINKED(state) || - !PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(u->sink_input))) + !PA_SINK_INPUT_IS_LINKED(u->sink_input->state)) return 0; pa_sink_input_cork(u->sink_input, state == PA_SINK_SUSPENDED); @@ -185,7 +185,7 @@ static void sink_set_volume_cb(pa_sink *s) { pa_assert_se(u = s->userdata); if (!PA_SINK_IS_LINKED(pa_sink_get_state(s)) || - !PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(u->sink_input))) + !PA_SINK_INPUT_IS_LINKED(u->sink_input->state)) return; pa_sink_input_set_volume(u->sink_input, &s->real_volume, s->save_volume, true); @@ -199,7 +199,7 @@ static void sink_set_mute_cb(pa_sink *s) { pa_assert_se(u = s->userdata); if (!PA_SINK_IS_LINKED(pa_sink_get_state(s)) || - !PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(u->sink_input))) + !PA_SINK_INPUT_IS_LINKED(u->sink_input->state)) return; pa_sink_input_set_mute(u->sink_input, s->muted, s->save_muted); |