[polypaudio-commits] r636 - /trunk/src/polypcore/sink-input.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Wed Mar  8 14:00:46 2006
New Revision: 636

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=636&root=polypaudio&view=rev
Log:
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.

Modified:
    trunk/src/polypcore/sink-input.c

Modified: trunk/src/polypcore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink-input.c?rev=636&root=polypaudio&r1=635&r2=636&view=diff
==============================================================================
--- trunk/src/polypcore/sink-input.c (original)
+++ trunk/src/polypcore/sink-input.c Wed Mar  8 14:00:46 2006
@@ -262,11 +262,10 @@
          * ourselves, or if this can be done by the sink for us */
 
         if (do_volume_adj_here)
+            /* 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*/
-
-            pa_cvolume_reset(volume, i->sample_spec.channels);
-        else
-            /* We had different channel maps, so we already did the adjustment */
             *volume = i->volume;
     }