Merge branch 'master' of github.com:RustAudio/rodio

Author: dvdsk

src/source/channel_volume.rs

@@ -34,12 +34,14 @@ where
         I::Item: Sample,
     {
         let mut sample = None;
-        for _ in 0..input.channels() {
+        let num_channels = input.channels();
+
+        for _ in 0..num_channels {
             if let Some(s) = input.next() {
                 sample = Some(
                     sample
                         .get_or_insert_with(I::Item::zero_value)
-                        .saturating_add(s),
+                        .saturating_add(s.amplify(1.0 / num_channels as f32)),
                 );
             }
         }
@@ -92,12 +94,15 @@ where
         if self.current_channel >= self.channel_volumes.len() {
             self.current_channel = 0;
             self.current_sample = None;
-            for _ in 0..self.input.channels() {
+
+            let num_channels = self.input.channels();
+
+            for _ in 0..num_channels {
                 if let Some(s) = self.input.next() {
                     self.current_sample = Some(
                         self.current_sample
                             .get_or_insert_with(I::Item::zero_value)
-                            .saturating_add(s),
+                            .saturating_add(s.amplify(1.0 / num_channels as f32)),
                     );
                 }
             }