diff options
author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-02-27 23:02:10 +0530 |
---|---|---|
committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-02-28 17:12:25 +0530 |
commit | 241dd91583050bda8bc916071c902c3d19906d93 (patch) | |
tree | ccbf55a25db5b9314fd387684c9c568c411014ad | |
parent | 4cf12b91a40a348b6f7d2e4f07dbd35322c2023e (diff) |
Revert "Add volume ramping feature - sink modification"
This reverts commit 897ef86b7fbb87ef17d30c584e6cd93abfc342bc.
Conflicts:
src/pulsecore/sink.c
(part of a patch series removing all ramping code)
-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); } } |