diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-28 19:39:10 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-28 19:39:10 +0000 |
commit | f834150aceccd753e3ac5bab9f7d64bed9993624 (patch) | |
tree | 410d90143d92967d06cc4f14f5571c7581543832 /src/pulsecore/sink.c | |
parent | 7b366a52c3cdab23b31b65762de3473b1649ed6e (diff) | |
parent | aa78853d728172f7fa564b2782f6e84661bfcd15 (diff) |
Merge remote-tracking branch 'arun/no-ramping'
Diffstat (limited to 'src/pulsecore/sink.c')
-rw-r--r-- | src/pulsecore/sink.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 9eb37911..43cd0d15 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -2056,15 +2056,10 @@ static void sync_input_volumes_within_thread(pa_sink *s) { pa_sink_assert_io_context(s); PA_HASHMAP_FOREACH(i, s->thread_info.inputs, state) { - if (pa_atomic_load(&i->before_ramping_v)) - i->thread_info.future_soft_volume = i->soft_volume; - if (pa_cvolume_equal(&i->thread_info.soft_volume, &i->soft_volume)) continue; - if (!pa_atomic_load(&i->before_ramping_v)) - i->thread_info.soft_volume = i->soft_volume; - + i->thread_info.soft_volume = i->soft_volume; pa_sink_input_request_rewind(i, 0, TRUE, FALSE, FALSE); } } |