projects
/
platform
/
upstream
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5318eb3
)
Add volume ramping feature - sink modification
author
zbt
<huan.zheng@intel.com>
Thu, 16 Jul 2009 02:41:58 +0000
(10:41 +0800)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 5 Aug 2009 18:10:47 +0000
(20:10 +0200)
src/pulsecore/sink.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/sink.c
b/src/pulsecore/sink.c
index
d8f3c7d
..
2950071
100644
(file)
--- a/
src/pulsecore/sink.c
+++ b/
src/pulsecore/sink.c
@@
-1599,10
+1599,14
@@
static void sync_input_volumes_within_thread(pa_sink *s) {
pa_sink_assert_ref(s);
while ((i = PA_SINK_INPUT(pa_hashmap_iterate(s->thread_info.inputs, &state, NULL)))) {
pa_sink_assert_ref(s);
while ((i = PA_SINK_INPUT(pa_hashmap_iterate(s->thread_info.inputs, &state, NULL)))) {
+ 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_cvolume_equal(&i->thread_info.soft_volume, &i->soft_volume))
continue;
- i->thread_info.soft_volume = i->soft_volume;
+ if (!pa_atomic_load(&i->before_ramping_v))
+ i->thread_info.soft_volume = i->soft_volume;
pa_sink_input_request_rewind(i, 0, TRUE, FALSE, FALSE);
}
}
pa_sink_input_request_rewind(i, 0, TRUE, FALSE, FALSE);
}
}