[pulseaudio-commits] src/pulsecore

[Arun Raghavan]

 src/pulsecore/source-output.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit da4163a85ebaa5e5794706b26b13ca11374dcf46
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Mon Nov 19 12:33:25 2012 +0530

    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.

diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 85045e7..6db2cbd 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;