From ef4ae785aa1d4d67b5df1c9414f6c1a144bc3460 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 15 Apr 2014 13:56:11 +0300 Subject: [PATCH] sink-input, source-output: Remove redundant get_mute() functions The functions just return the muted value. Callers can as well read the struct field directly, it's simpler that way. --- src/modules/dbus/iface-stream.c | 4 ++-- src/modules/module-role-cork.c | 9 ++++----- src/modules/module-stream-restore.c | 4 ++-- src/pulsecore/cli-text.c | 4 ++-- src/pulsecore/protocol-native.c | 4 ++-- src/pulsecore/sink-input.c | 9 --------- src/pulsecore/sink-input.h | 1 - src/pulsecore/source-output.c | 9 --------- src/pulsecore/source-output.h | 1 - 9 files changed, 12 insertions(+), 33 deletions(-) diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c index 1cff95e0..4cbcd74f 100644 --- a/src/modules/dbus/iface-stream.c +++ b/src/modules/dbus/iface-stream.c @@ -765,7 +765,7 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t } } - new_mute = pa_sink_input_get_mute(s->sink_input); + new_mute = s->sink_input->muted; if (s->mute != new_mute) { s->mute = new_mute; @@ -861,7 +861,7 @@ pa_dbusiface_stream *pa_dbusiface_stream_new_playback(pa_dbusiface_core *core, p else pa_cvolume_init(&s->volume); - s->mute = pa_sink_input_get_mute(sink_input); + s->mute = sink_input->muted; s->proplist = pa_proplist_copy(sink_input->proplist); s->dbus_protocol = pa_dbus_protocol_get(sink_input->core); s->subscription = pa_subscription_new(sink_input->core, PA_SUBSCRIPTION_MASK_SINK_INPUT, subscription_cb, s); diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c index 6573cd6a..8ca21098 100644 --- a/src/modules/module-role-cork.c +++ b/src/modules/module-role-cork.c @@ -102,7 +102,7 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in pa_sink_assert_ref(s); for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) { - bool corked, muted, corked_here; + bool corked, corked_here; const char *role; if (j == ignore) @@ -119,10 +119,9 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in continue; corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED); - muted = pa_sink_input_get_mute(j); corked_here = !!pa_hashmap_get(u->cork_state, j); - if (cork && !corked && !muted) { + if (cork && !corked && !j->muted) { pa_log_debug("Found a '%s' stream that should be corked/muted.", cork_role); if (!corked_here) pa_hashmap_put(u->cork_state, j, PA_INT_TO_PTR(1)); @@ -131,9 +130,9 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in } else if (!cork) { pa_hashmap_remove(u->cork_state, j); - if (corked_here && (corked || muted)) { + if (corked_here && (corked || j->muted)) { pa_log_debug("Found a '%s' stream that should be uncorked/unmuted.", cork_role); - if (muted) + if (j->muted) pa_sink_input_set_mute(j, false, false); if (corked) pa_sink_input_send_event(j, PA_STREAM_EVENT_REQUEST_UNCORK, NULL); diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index 3774d497..38d6aac6 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -1299,7 +1299,7 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3 } if (sink_input->save_muted) { - entry->muted = pa_sink_input_get_mute(sink_input); + entry->muted = sink_input->muted; entry->muted_valid = true; mute_updated = !created_new_entry && (!old->muted_valid || entry->muted != old->muted); @@ -1349,7 +1349,7 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3 } if (source_output->save_muted) { - entry->muted = pa_source_output_get_mute(source_output); + entry->muted = source_output->muted; entry->muted_valid = true; mute_updated = !created_new_entry && (!old->muted_valid || entry->muted != old->muted); diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c index c7db0a6a..2992ae83 100644 --- a/src/pulsecore/cli-text.c +++ b/src/pulsecore/cli-text.c @@ -536,7 +536,7 @@ char *pa_source_output_list_to_string(pa_core *c) { state_table[pa_source_output_get_state(o)], o->source->index, o->source->name, volume_str, - pa_yes_no(pa_source_output_get_mute(o)), + pa_yes_no(o->muted), (double) pa_source_output_get_latency(o, NULL) / PA_USEC_PER_MSEC, clt, pa_sample_spec_snprint(ss, sizeof(ss), &o->sample_spec), @@ -634,7 +634,7 @@ char *pa_sink_input_list_to_string(pa_core *c) { state_table[pa_sink_input_get_state(i)], i->sink->index, i->sink->name, volume_str, - pa_yes_no(pa_sink_input_get_mute(i)), + pa_yes_no(i->muted), (double) pa_sink_input_get_latency(i, NULL) / PA_USEC_PER_MSEC, clt, pa_sample_spec_snprint(ss, sizeof(ss), &i->sample_spec), diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 41b4b505..96df383d 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -3366,7 +3366,7 @@ static void sink_input_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_tagstruct_puts(t, pa_resample_method_to_string(pa_sink_input_get_resample_method(s))); pa_tagstruct_puts(t, s->driver); if (c->version >= 11) - pa_tagstruct_put_boolean(t, pa_sink_input_get_mute(s)); + pa_tagstruct_put_boolean(t, s->muted); if (c->version >= 13) pa_tagstruct_put_proplist(t, s->proplist); if (c->version >= 19) @@ -3413,7 +3413,7 @@ static void source_output_fill_tagstruct(pa_native_connection *c, pa_tagstruct * pa_tagstruct_put_boolean(t, (pa_source_output_get_state(s) == PA_SOURCE_OUTPUT_CORKED)); if (c->version >= 22) { pa_tagstruct_put_cvolume(t, &v); - pa_tagstruct_put_boolean(t, pa_source_output_get_mute(s)); + pa_tagstruct_put_boolean(t, s->muted); pa_tagstruct_put_boolean(t, has_volume); pa_tagstruct_put_boolean(t, s->volume_writable); pa_tagstruct_put_format_info(t, s->format); diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index e41afc9b..cfec051f 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -1426,15 +1426,6 @@ void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save) { pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index); } -/* Called from main context */ -bool pa_sink_input_get_mute(pa_sink_input *i) { - pa_sink_input_assert_ref(i); - pa_assert_ctl_context(); - pa_assert(PA_SINK_INPUT_IS_LINKED(i->state)); - - return i->muted; -} - /* Called from main thread */ void pa_sink_input_update_proplist(pa_sink_input *i, pa_update_mode_t mode, pa_proplist *p) { pa_sink_input_assert_ref(i); diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h index 2be2c33e..a48476cb 100644 --- a/src/pulsecore/sink-input.h +++ b/src/pulsecore/sink-input.h @@ -375,7 +375,6 @@ int pa_sink_input_remove_volume_factor(pa_sink_input *i, const char *key); pa_cvolume *pa_sink_input_get_volume(pa_sink_input *i, pa_cvolume *volume, bool absolute); void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save); -bool pa_sink_input_get_mute(pa_sink_input *i); void pa_sink_input_update_proplist(pa_sink_input *i, pa_update_mode_t mode, pa_proplist *p); diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index bb893847..d3888df2 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -1084,15 +1084,6 @@ void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save) { pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index); } -/* Called from main context */ -bool pa_source_output_get_mute(pa_source_output *o) { - pa_source_output_assert_ref(o); - pa_assert_ctl_context(); - pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state)); - - return o->muted; -} - /* Called from main thread */ void pa_source_output_update_proplist(pa_source_output *o, pa_update_mode_t mode, pa_proplist *p) { pa_source_output_assert_ref(o); diff --git a/src/pulsecore/source-output.h b/src/pulsecore/source-output.h index 27d6fd45..73170d30 100644 --- a/src/pulsecore/source-output.h +++ b/src/pulsecore/source-output.h @@ -318,7 +318,6 @@ void pa_source_output_set_volume(pa_source_output *o, const pa_cvolume *volume, pa_cvolume *pa_source_output_get_volume(pa_source_output *o, pa_cvolume *volume, bool absolute); void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save); -bool pa_source_output_get_mute(pa_source_output *o); void pa_source_output_update_proplist(pa_source_output *o, pa_update_mode_t mode, pa_proplist *p); -- 2.39.2