mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

if the channel map was modified due to PA_SINK_INPUT_FIX_CHANNELS, remap the specified volume properly

Browse source
This commit is contained in:
Lennart Poettering 2008-10-07 22:46:18 +02:00
parent e1dbc75eb8
commit e053fa03f7
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/pulsecore/sink-input.c
View file

@ -171,6 +171,8 @@ pa_sink_input* pa_sink_input_new(
if (flags & PA_SINK_INPUT_FIX_RATE) if (flags & PA_SINK_INPUT_FIX_RATE)
data->sample_spec.rate = data->sink->sample_spec.rate; data->sample_spec.rate = data->sink->sample_spec.rate;
original_cm = data->channel_map;
if (flags & PA_SINK_INPUT_FIX_CHANNELS) { if (flags & PA_SINK_INPUT_FIX_CHANNELS) {
data->sample_spec.channels = data->sink->sample_spec.channels; data->sample_spec.channels = data->sink->sample_spec.channels;
data->channel_map = data->sink->channel_map; data->channel_map = data->sink->channel_map;
@ -180,8 +182,7 @@ pa_sink_input* pa_sink_input_new(
pa_assert(pa_channel_map_valid(&data->channel_map)); pa_assert(pa_channel_map_valid(&data->channel_map));
/* Due to the fixing of the sample spec the volume might not match anymore */ /* Due to the fixing of the sample spec the volume might not match anymore */
if (data->volume.channels != data->sample_spec.channels) pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map);
pa_cvolume_set(&data->volume, data->sample_spec.channels, pa_cvolume_avg(&data->volume));
if (data->resample_method == PA_RESAMPLER_INVALID) if (data->resample_method == PA_RESAMPLER_INVALID)
data->resample_method = core->resample_method; data->resample_method = core->resample_method;