mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/merge-queue'

Browse source 
Conflicts:
	src/pulsecore/sink-input.c
	src/pulsecore/sink.c
This commit is contained in:
Lennart Poettering 2009-11-05 22:54:42 +01:00
commit 4d62f159a7
5 changed files with 600 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/sink.c
View file

@ -1731,10 +1731,14 @@ 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;
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);
}
}