mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
instead of resetting virtual_volume unconditionally on initialization, do so only when no volume was set before
This commit is contained in:
parent
1e513c3420
commit
624f220aa6
1 changed files with 5 additions and 2 deletions
|
|
@ -150,13 +150,16 @@ pa_sink_input* pa_sink_input_new(
|
||||||
pa_return_null_if_fail(pa_channel_map_valid(&data->channel_map));
|
pa_return_null_if_fail(pa_channel_map_valid(&data->channel_map));
|
||||||
pa_return_null_if_fail(data->channel_map.channels == data->sample_spec.channels);
|
pa_return_null_if_fail(data->channel_map.channels == data->sample_spec.channels);
|
||||||
|
|
||||||
if (!data->volume_is_set)
|
if (!data->volume_is_set) {
|
||||||
pa_cvolume_reset(&data->volume, data->sample_spec.channels);
|
pa_cvolume_reset(&data->volume, data->sample_spec.channels);
|
||||||
|
pa_cvolume_reset(&data->virtual_volume, data->sample_spec.channels);
|
||||||
|
}
|
||||||
|
|
||||||
pa_return_null_if_fail(pa_cvolume_valid(&data->volume));
|
pa_return_null_if_fail(pa_cvolume_valid(&data->volume));
|
||||||
pa_return_null_if_fail(data->volume.channels == data->sample_spec.channels);
|
pa_return_null_if_fail(data->volume.channels == data->sample_spec.channels);
|
||||||
|
|
||||||
data->virtual_volume = data->volume;
|
pa_return_null_if_fail(pa_cvolume_valid(&data->virtual_volume));
|
||||||
|
pa_return_null_if_fail(pa_cvolume_compatible(&data->virtual_volume.channels, &data->sample_spec));
|
||||||
|
|
||||||
if (!data->muted_is_set)
|
if (!data->muted_is_set)
|
||||||
data->muted = FALSE;
|
data->muted = FALSE;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue