We filled the volume with the wrong channel count (we used the input, not

the output) causing static. Also swapped the comments since they were
misplaced.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@636 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/polypcore/sink-input.c b/src/polypcore/sink-input.c
index f12a85e..e1703b9 100644 (file)
--- a/src/polypcore/sink-input.c
+++ b/src/polypcore/sink-input.c
@@ -262,11 +262,10 @@ finish:
          * ourselves, or if this can be done by the sink for us */
 
         if (do_volume_adj_here)
-            /* We've both the same channel map, so let's have the sink do the adjustment for us*/
-
-            pa_cvolume_reset(volume, i->sample_spec.channels);
-        else
             /* We had different channel maps, so we already did the adjustment */
+            pa_cvolume_reset(volume, i->sink->sample_spec.channels);
+        else
+            /* We've both the same channel map, so let's have the sink do the adjustment for us*/
             *volume = i->volume;
     }