projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4cf12b9
)
Revert "Add volume ramping feature - sink modification"
author
Arun Raghavan
<arun.raghavan@collabora.co.uk>
Sun, 27 Feb 2011 17:32:10 +0000
(23:02 +0530)
committer
Arun Raghavan
<arun.raghavan@collabora.co.uk>
Mon, 28 Feb 2011 11:42:25 +0000
(17:12 +0530)
This reverts commit
897ef86b7fbb87ef17d30c584e6cd93abfc342bc
.
Conflicts:
src/pulsecore/sink.c
(part of a patch series removing all ramping code)
src/pulsecore/sink.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/sink.c
b/src/pulsecore/sink.c
index
9eb3791
..
43cd0d1
100644
(file)
--- 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);
}
}