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

source-output: Fix volume fixup for rate update

Browse source 
The could that should have been after the rate update ended up being
before, which is incorrect.
This commit is contained in:
Arun Raghavan 2012-11-19 12:33:25 +05:30
parent 93836989e6
commit da4163a85e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/source-output.c
View file

@ -340,9 +340,6 @@ int pa_source_output_new(
pa_assert(pa_sample_spec_valid(&data->sample_spec));
pa_assert(pa_channel_map_valid(&data->channel_map));
/* Due to the fixing of the sample spec the volume might not match anymore */
pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map);
if (!(data->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) &&
!pa_sample_spec_equal(&data->sample_spec, &data->source->sample_spec)){
/* try to change source rate. This is done before the FIXATE hook since
@ -353,6 +350,9 @@ int pa_source_output_new(
pa_log_info("Rate changed to %u Hz", data->source->sample_spec.rate);
}
/* Due to the fixing of the sample spec the volume might not match anymore */
pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map);
if (data->resample_method == PA_RESAMPLER_INVALID)
data->resample_method = core->resample_method;