From 4cf12b91a40a348b6f7d2e4f07dbd35322c2023e Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sun, 27 Feb 2011 23:02:03 +0530 Subject: Revert "ramping: minor cleanups" This reverts commit f202af17b717f5b383ac072f80a6c1327bc3143b. (part of a patch series removing all ramping code) --- src/pulsecore/sink-input.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/pulsecore/sink-input.c') diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 028f0f69..a5fdccf8 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -2040,7 +2040,6 @@ void pa_sink_input_set_volume_with_ramping(pa_sink_input *i, const pa_cvolume *v else volume = pa_sw_cvolume_multiply_scalar(&v, &v, pa_cvolume_max(volume)); } else { - if (!pa_cvolume_compatible(volume, &i->sample_spec)) { v = i->volume; volume = pa_cvolume_scale(&v, pa_cvolume_max(volume)); @@ -2095,18 +2094,15 @@ void pa_sink_input_set_volume_with_ramping(pa_sink_input *i, const pa_cvolume *v void pa_sink_input_set_mute_with_ramping(pa_sink_input *i, pa_bool_t mute, pa_bool_t save, pa_usec_t t){ + pa_assert(i); pa_sink_input_assert_ref(i); - pa_assert_ctl_context(); pa_assert(PA_SINK_INPUT_IS_LINKED(i->state)); - if (!i->muted == !mute) { - i->save_muted = i->save_muted || mute; + if (!i->muted == !mute) return; - } i->muted = mute; i->save_muted = save; - /* Set this flag before the following code modify i->thread_info.muted, otherwise distortion will be heard */ if (t > 0) pa_atomic_store(&i->before_ramping_m, 1); @@ -2116,9 +2112,5 @@ void pa_sink_input_set_mute_with_ramping(pa_sink_input *i, pa_bool_t mute, pa_bo if (t > 0) sink_input_set_ramping_info_for_mute(i, mute, t); - /* The mute status changed, let's tell people so */ - if (i->mute_changed) - i->mute_changed(i); - pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index); } -- cgit