From da4163a85ebaa5e5794706b26b13ca11374dcf46 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 19 Nov 2012 12:33:25 +0530 Subject: source-output: Fix volume fixup for rate update The could that should have been after the rate update ended up being before, which is incorrect. --- src/pulsecore/source-output.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 85045e75..6db2cbde 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -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; -- cgit v1.2.3